From 102a52ca14e7a2149d07561467f7b97b534f8183 Mon Sep 17 00:00:00 2001 From: Oliver Grawert <ogra@ubuntu.com> Date: Wed, 7 Aug 2013 21:56:07 +0200 Subject: [PATCH] Import patches-unapplied version 2.171 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: ec9dcca06cf61f62dfb102c9b2f6cb52b1e97c8b New changelog entries: * seems unlike my local build the buildd doesnt get along with links, use copy instead --- debian/changelog | 7 +++++++ live-build/auto/build | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 958e5d06..83aee46b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.171) saucy; urgency=low + + * seems unlike my local build the buildd doesnt get along with links, use + copy instead + + -- Oliver Grawert <ogra@ubuntu.com> Wed, 07 Aug 2013 21:56:07 +0200 + livecd-rootfs (2.170) saucy; urgency=low * fix package mirror in android package install routine diff --git a/live-build/auto/build b/live-build/auto/build index c25b19ac..87b172be 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -440,7 +440,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then cp "chroot/usr/share/android/product/${REL}-preinstalled-boot-armhf+${subarch}.img"\ "${PREFIX}.boot-armhf+${subarch}.img" # drop this following line once cdimage can handle -boot-*.img - ln -s "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" + cp "${PREFIX}.boot-armhf+${subarch}.img" "${PREFIX}.bootimg-${subarch}" cp "chroot/usr/share/android/product/${REL}-preinstalled-touch-armel+${subarch}.zip"\ "${PREFIX}.armel+${subarch}.zip" done