Import patches-unapplied version 2.197 to ubuntu/trusty-proposed

Imported using git-ubuntu import.

Changelog parent: 59c8f137e1

New changelog entries:
  * Workaround to make ubuntu-touch build with older android package.
impish 2.197
Stéphane Graber 11 years ago committed by usd-importer
parent 59c8f137e1
commit 6ab1ece7b0

6
debian/changelog vendored

@ -1,3 +1,9 @@
livecd-rootfs (2.197) trusty; urgency=low
* Workaround to make ubuntu-touch build with older android package.
-- Stéphane Graber <stgraber@ubuntu.com> Sun, 20 Oct 2013 16:52:29 -0400
livecd-rootfs (2.196) saucy; urgency=low livecd-rootfs (2.196) saucy; urgency=low
* Removing the PPAs for Ubuntu Touch builds. * Removing the PPAs for Ubuntu Touch builds.

@ -439,15 +439,15 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
REL="$LB_DISTRIBUTION" REL="$LB_DISTRIBUTION"
for subarch in $touchsubarches; do for subarch in $touchsubarches; do
cp "chroot/usr/share/android/product/${REL}-preinstalled-system-armel+${subarch}.img"\ cp "chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img"\
"${PREFIX}.system-armel+${subarch}.img" "${PREFIX}.system-armel+${subarch}.img"
cp "chroot/usr/share/android/product/${REL}-preinstalled-recovery-armel+${subarch}.img"\ cp "chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img"\
"${PREFIX}.recovery-armel+${subarch}.img" "${PREFIX}.recovery-armel+${subarch}.img"
cp "chroot/usr/share/android/product/${REL}-preinstalled-boot-armhf+${subarch}.img"\ cp "chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img"\
"${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.boot-armhf+${subarch}.img"
# drop this following line once cdimage can handle -boot-*.img # drop this following line once cdimage can handle -boot-*.img
cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}"
cp "chroot/usr/share/android/product/${REL}-preinstalled-touch-armel+${subarch}.zip"\ cp "chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip"\
"${PREFIX}.armel+${subarch}.zip" "${PREFIX}.armel+${subarch}.zip"
done done

Loading…
Cancel
Save