determine the value for $kver inside the chroot, use -c and drop -t with update-initramfs for ubuntu-touch

ubuntu/trusty
Oliver Grawert 12 years ago
parent 878953785b
commit b870dec921

7
debian/changelog vendored

@ -1,3 +1,10 @@
livecd-rootfs (2.136) UNRELEASED; urgency=low
* ubuntu-touch: determine the value for $kver inside the chroot, not
outside. Use -c and drop -t with update-initramfs
-- Oliver Grawert <ogra@ubuntu.com> Mon, 27 May 2013 18:13:05 +0200
livecd-rootfs (2.135) saucy; urgency=low livecd-rootfs (2.135) saucy; urgency=low
[ Colin Watson ] [ Colin Watson ]

@ -410,12 +410,12 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
lb chroot_sysfs install "$@" lb chroot_sysfs install "$@"
lb chroot_devpts 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-} kver=${kpkg#linux-image-}
Chroot chroot "apt-get -y install $kpkg" Chroot chroot "apt-get -y install $kpkg"
bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}" 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 "abootimg --create /boot/bootimg-${subarch}.img -f $bootimgcfg -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
Chroot chroot "apt-get -y purge $kpkg" Chroot chroot "apt-get -y purge $kpkg"

Loading…
Cancel
Save