From cbb55967d935e289dfdf3f7525df1b9b5e746699 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 30 May 2013 18:21:06 +0200 Subject: [PATCH] Import patches-unapplied version 2.146 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 84f1c3ad0412ecbe9594f42ccc7cedd08101de61 New changelog entries: * drop the generic .bootimg from ubuntu-touch, all boot images we need have to be subarch tagged --- debian/changelog | 7 +++++++ live-build/auto/build | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b4a3be2e..53661d9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.146) saucy; urgency=low + + * drop the generic .bootimg from ubuntu-touch, all boot images we need have + to be subarch tagged + + -- Oliver Grawert Thu, 30 May 2013 18:21:06 +0200 + livecd-rootfs (2.145) saucy; urgency=low * adjust naming of the bootimg files so cdimage picks them up for publishing diff --git a/live-build/auto/build b/live-build/auto/build index 969ed20a..9a55659c 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -434,7 +434,6 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}" cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}" - ln -sf "$PREFIX.bootimg-${subarch}" "$PREFIX.bootimg" Chroot chroot "apt-get -y purge $kpkg" done