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

Imported using git-ubuntu import.

Changelog parent: d9c6a7fcc14cbbfbd3765400feea6f6d17008677

New changelog entries:
  * we do better not try to create something outside of a chroot while we are
    in it :P (make sure bootimg's are created in /boot of the chroot and only
    copied afterwards).
This commit is contained in:
Oliver Grawert 2013-06-29 16:59:28 +02:00 committed by usd-importer
parent d9c6a7fcc1
commit 71b93fe427
2 changed files with 10 additions and 1 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.153) saucy; urgency=low
* we do better not try to create something outside of a chroot while we are
in it :P (make sure bootimg's are created in /boot of the chroot and only
copied afterwards).
-- Oliver Grawert <ogra@ubuntu.com> Sat, 29 Jun 2013 16:59:28 +0200
livecd-rootfs (2.152) saucy; urgency=low
* live-build/auto/build: Fix syntax error.

View File

@ -439,7 +439,8 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
initrdimg="/usr/lib/ubuntu-touch-generic-initrd/initrd.img-touch"
Chroot chroot "abootimg --create "$PREFIX.bootimg-${subarch}" -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r ${initrdimg} -k /boot/vmlinuz-${kver}"
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
done
lb chroot_devpts remove "$@"