From 5e6b64e039cc5a46f4b96f3900480af14147ed29 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 12 Aug 2015 12:19:01 +0200 Subject: [PATCH] drop copying of zip files of the android package, we do not generate these anymore --- debian/changelog | 4 +++- live-build/auto/build | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 419c0b31..e5ad29dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ livecd-rootfs (2.339) UNRELEASED; urgency=medium * revert the apparmor-super-noise change, issue is found * touch the cache files during build to prevent timestamp issues in the future + * drop copying of zip files of the android package, we do not generate these + anymore. - -- Oliver Grawert Wed, 12 Aug 2015 12:14:47 +0200 + -- Oliver Grawert Wed, 12 Aug 2015 12:17:51 +0200 livecd-rootfs (2.338) wily; urgency=medium diff --git a/live-build/auto/build b/live-build/auto/build index 97523cb6..40968052 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -473,10 +473,6 @@ if [ "$PROJECT" = "ubuntu-touch" ]; then "${PREFIX}.boot-armhf+${subarch}.img" # drop this following line once cdimage can handle -boot-*.img cp -v "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" - - # Android 4.4.2 based images do not ship a .zip file, do not fail if it does not exist - cp -v chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\ - "${PREFIX}.armel+${subarch}.zip" || true done fi if [ "$ARCH" = "i386" ]; then