From eb5162d504114dc3d5b0461bada2f3d9d580b997 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Tue, 26 May 2015 14:12:09 +0200 Subject: [PATCH] Import patches-unapplied version 2.303 to ubuntu/wily-proposed Imported using git-ubuntu import. Changelog parent: a4c006633a9e411c5526fa57cd85bec020b6565c New changelog entries: * drop grouper from touchsubarches variable. the android package does not provide any grouper images anymore which makes touch image builds fail. --- debian/changelog | 7 +++++++ live-build/auto/build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a261ad11..9901bc8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.303) wily; urgency=medium + + * drop grouper from touchsubarches variable. the android package does not + provide any grouper images anymore which makes touch image builds fail. + + -- Oliver Grawert Tue, 26 May 2015 14:12:09 +0200 + livecd-rootfs (2.302) wily; urgency=medium * Call Setup_cleanup in live-build/auto/build to set exit handler. diff --git a/live-build/auto/build b/live-build/auto/build index 3c5d203f..0cf28a29 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -461,7 +461,7 @@ if [ "$PROJECT" = "ubuntu-touch" ]; then Chroot chroot "apt-get -y install android" if [ "$ARCH" = "armhf" ]; then - touchsubarches="flo manta grouper mako generic" + touchsubarches="flo manta mako generic" for subarch in $touchsubarches; do cp -v chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\ "${PREFIX}.system-armel+${subarch}.img"