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.
This commit is contained in:
Oliver Grawert 2015-05-26 14:12:09 +02:00 committed by usd-importer
parent a4c006633a
commit eb5162d504
2 changed files with 8 additions and 1 deletions

7
debian/changelog vendored
View File

@ -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 <ogra@ubuntu.com> 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.

View File

@ -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"