From 0022f57f81f1370338635a8cd0c59776e6ff95bd Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Mon, 27 May 2013 18:13:05 +0200 Subject: [PATCH] Import patches-unapplied version 2.136 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: c29877b2fc1129176bfdef93d14472c041d194a8 New changelog entries: * ubuntu-touch: determine the value for $kver inside the chroot, not outside. Use -c and drop -t with update-initramfs --- debian/changelog | 7 +++++++ live-build/auto/build | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7db25f7e..8d767d67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.136) saucy; urgency=low + + * ubuntu-touch: determine the value for $kver inside the chroot, not + outside. Use -c and drop -t with update-initramfs + + -- Oliver Grawert Mon, 27 May 2013 18:13:05 +0200 + livecd-rootfs (2.135) saucy; urgency=low [ Colin Watson ] diff --git a/live-build/auto/build b/live-build/auto/build index ef730b2d..d44aecde 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -410,12 +410,12 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then lb chroot_sysfs install "$@" lb chroot_devpts install "$@" - kpkg="$(apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/ Depends: //')" + kpkg="$(Chroot chroot apt-cache depends linux-image-$subarch|grep Depends|sed -e 's/ Depends: //')" kver=${kpkg#linux-image-} Chroot chroot "apt-get -y install $kpkg" bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}" - Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k $kver -t -u -v" + 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"