Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-14 06:38:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 8ee97385eb5b1ef72f1947a0f8c5b976e3320091

New changelog entries:
  * make removal of non existing old initrds non fatal in ubuntu-touch
This commit is contained in:
Oliver Grawert 2013-05-29 16:25:18 +02:00 committed by usd-importer
parent 8ee97385eb
commit 331562fe9b
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.141) saucy; urgency=low
* make removal of non existing old initrds non fatal in ubuntu-touch
-- Oliver Grawert <ogra@ubuntu.com> Wed, 29 May 2013 16:25:18 +0200
livecd-rootfs (2.140) saucy; urgency=low
* hardcode dist in the temporary sources.list of the ubuntu-touch initrd

4
live-build/auto/build
View File

@ -435,8 +435,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
Chroot chroot "apt-get -y purge $kpkg"
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}-boot.img"
rm "chroot/boot/bootimg-${subarch}.img" "/chroot/boot/initrd.img-"* "/chroot/boot/vmlinuz-"*
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-boot-${subarch}.img"
done
lb chroot_devpts remove "$@"
@ -457,6 +456,7 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
else
rm chroot/etc/resolv.conf
fi
rm -rf chroot/boot/* || true
fi
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))