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

Imported using git-ubuntu import.

Changelog parent: 84f1c3ad0412ecbe9594f42ccc7cedd08101de61

New changelog entries:
  * drop the generic .bootimg from ubuntu-touch, all boot images we need have
    to be subarch tagged
This commit is contained in:
Oliver Grawert 2013-05-30 18:21:06 +02:00 committed by usd-importer
parent 84f1c3ad04
commit cbb55967d9
2 changed files with 7 additions and 1 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.146) saucy; urgency=low
* drop the generic .bootimg from ubuntu-touch, all boot images we need have
to be subarch tagged
-- Oliver Grawert <ogra@ubuntu.com> Thu, 30 May 2013 18:21:06 +0200
livecd-rootfs (2.145) saucy; urgency=low
* adjust naming of the bootimg files so cdimage picks them up for publishing

View File

@ -434,7 +434,6 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
Chroot chroot "abootimg --create /boot/bootimg-${subarch}.img -f ${bootimgcfg} -r /boot/initrd.img-${kver} -k /boot/vmlinuz-${kver}"
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX.bootimg-${subarch}"
ln -sf "$PREFIX.bootimg-${subarch}" "$PREFIX.bootimg"
Chroot chroot "apt-get -y purge $kpkg"
done