From 84f1c3ad0412ecbe9594f42ccc7cedd08101de61 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 30 May 2013 12:14:38 +0200 Subject: [PATCH] Import patches-unapplied version 2.145 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 7f4def3fd6adcaa369b7fdeb41619e8c6728f2fc New changelog entries: * adjust naming of the bootimg files so cdimage picks them up for publishing --- debian/changelog | 6 ++++++ live-build/auto/build | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c9e24134..b4a3be2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.145) saucy; urgency=low + + * adjust naming of the bootimg files so cdimage picks them up for publishing + + -- Oliver Grawert Thu, 30 May 2013 12:14:38 +0200 + livecd-rootfs (2.144) saucy; urgency=low * Clean up subarch loop for touch subarches to skip unwanted deps. diff --git a/live-build/auto/build b/live-build/auto/build index 8e8dd38e..969ed20a 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -433,7 +433,8 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k ${kver} -c -v" 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-${subarch}.bootimg" + cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}" + ln -sf "$PREFIX.bootimg-${subarch}" "$PREFIX.bootimg" Chroot chroot "apt-get -y purge $kpkg" done