From fb4a8326990b7d59eaa14d6ff2bb460e39cae5ef Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 13 Mar 2015 11:13:11 +0100 Subject: [PATCH] add more verbosity to the copy command for android fragments in ubuntu-touch --- debian/changelog | 7 +++++++ live-build/auto/build | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5726f4c5..f8097732 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.294) UNRELEASED; urgency=medium + + * add more verbosity to the copy command for android fragments in + ubuntu-touch + + -- Oliver Grawert Fri, 13 Mar 2015 11:10:33 +0100 + livecd-rootfs (2.293) vivid; urgency=low [ Michael Vogt ] diff --git a/live-build/auto/build b/live-build/auto/build index 6552fb0a..447eb22a 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -448,31 +448,31 @@ if [ "$PROJECT" = "ubuntu-touch" ]; then if [ "$ARCH" = "armhf" ]; then touchsubarches="flo manta grouper mako generic" for subarch in $touchsubarches; do - cp chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\ + cp -v chroot/usr/share/android/product/*-preinstalled-system-armel+${subarch}.img\ "${PREFIX}.system-armel+${subarch}.img" - cp chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\ + cp -v chroot/usr/share/android/product/*-preinstalled-recovery-armel+${subarch}.img\ "${PREFIX}.recovery-armel+${subarch}.img" - cp chroot/usr/share/android/product/*-preinstalled-boot-armhf+${subarch}.img\ + cp -v 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 -v "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" - # Android 4.4.2 based images don't ship a .zip file, do not fail if it does not exist - cp chroot/usr/share/android/product/*-preinstalled-touch-armel+${subarch}.zip\ + # 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 touchsubarches="generic_x86" for subarch in $touchsubarches; do - cp chroot/usr/share/android/product/*-preinstalled-system-i386+${subarch}.img\ + cp -v chroot/usr/share/android/product/*-preinstalled-system-i386+${subarch}.img\ "${PREFIX}.system-i386+${subarch}.img" - cp chroot/usr/share/android/product/*-preinstalled-recovery-i386+${subarch}.img\ + cp -v chroot/usr/share/android/product/*-preinstalled-recovery-i386+${subarch}.img\ "${PREFIX}.recovery-i386+${subarch}.img" - cp chroot/usr/share/android/product/*-preinstalled-boot-i386+${subarch}.img\ + cp -v chroot/usr/share/android/product/*-preinstalled-boot-i386+${subarch}.img\ "${PREFIX}.boot-i386+${subarch}.img" # drop this following line once cdimage can handle -boot-*.img - cp "${PREFIX}.boot-i386+${subarch}.img" "${PREFIX}.bootimg-${subarch}" + cp -v "${PREFIX}.boot-i386+${subarch}.img" "${PREFIX}.bootimg-${subarch}" done fi