Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-13 20:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.136 to ubuntu/saucy-proposed

Browse Source 
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
This commit is contained in:
Oliver Grawert 2013-05-27 18:13:05 +02:00 committed by usd-importer
parent c29877b2fc
commit 0022f57f81
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <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 ]

4
live-build/auto/build
View File

@ -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"