From 80b176e6b2fbba3c69a9af53b9b78d67c2e1fa44 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Wed, 29 May 2013 16:53:56 +0200 Subject: [PATCH] Import patches-unapplied version 2.142 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 331562fe9b6c7b589b1ad4dd43fdf658d87a8ff6 New changelog entries: * copy the initrd out of the chroot before we purge the kernel package on ubuntu-touch --- debian/changelog | 7 +++++++ live-build/auto/build | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a3454ce8..6dda28c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.142) saucy; urgency=low + + * copy the initrd out of the chroot before we purge the kernel package on + ubuntu-touch + + -- Oliver Grawert Wed, 29 May 2013 16:53:56 +0200 + livecd-rootfs (2.141) saucy; urgency=low * make removal of non existing old initrds non fatal in ubuntu-touch diff --git a/live-build/auto/build b/live-build/auto/build index fdb2b908..a1ca0f8f 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -433,9 +433,9 @@ 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}" - Chroot chroot "apt-get -y purge $kpkg" - cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-boot-${subarch}.img" + + Chroot chroot "apt-get -y purge $kpkg" done lb chroot_devpts remove "$@"