From 6ab1ece7b0fdce9e27ae8da448463b7a3ab4b6f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Sun, 20 Oct 2013 16:52:29 -0400 Subject: [PATCH] Import patches-unapplied version 2.197 to ubuntu/trusty-proposed Imported using git-ubuntu import. Changelog parent: 59c8f137e1d28d9376f17ba752897eb671b43c89 New changelog entries: * Workaround to make ubuntu-touch build with older android package. --- debian/changelog | 6 ++++++ live-build/auto/build | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 003b7654..7b1d0a82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.197) trusty; urgency=low + + * Workaround to make ubuntu-touch build with older android package. + + -- Stéphane Graber Sun, 20 Oct 2013 16:52:29 -0400 + livecd-rootfs (2.196) saucy; urgency=low * Removing the PPAs for Ubuntu Touch builds. diff --git a/live-build/auto/build b/live-build/auto/build index 88133d05..2e105061 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -439,15 +439,15 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then REL="$LB_DISTRIBUTION" 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" - 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" - 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" # drop this following line once cdimage can handle -boot-*.img 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" done