Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-11-04 02:44:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 80b176e6b2fbba3c69a9af53b9b78d67c2e1fa44

New changelog entries:
  * drop all the cleanup code, we already have the tarball and don't need to
    clean the chroot.
  * add better quoting for update-initramfs and abootimg calls for
    ubuntu-touch
This commit is contained in:
Oliver Grawert 2013-05-29 21:47:03 +02:00 committed by usd-importer
parent 80b176e6b2
commit a879155deb
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
livecd-rootfs (2.143) saucy; urgency=low
* drop all the cleanup code, we already have the tarball and don't need to
clean the chroot.
* add better quoting for update-initramfs and abootimg calls for
ubuntu-touch
-- Oliver Grawert <ogra@ubuntu.com> Wed, 29 May 2013 21:47:03 +0200
livecd-rootfs (2.142) saucy; urgency=low
* copy the initrd out of the chroot before we purge the kernel package on

22
live-build/auto/build
View File

@ -430,10 +430,10 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
Chroot chroot "apt-get -y install $kpkg"
bootimgcfg="/usr/share/initramfs-tools-ubuntu-touch/bootimg.cfg-${subarch}"
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 "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}"
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-boot-${subarch}.img"
cp "chroot/boot/bootimg-${subarch}.img" "$PREFIX-${subarch}.bootimg"
Chroot chroot "apt-get -y purge $kpkg"
done
@ -441,22 +441,6 @@ if [ "$PROJECT" = "ubuntu-touch" ] && [ "$ARCH" = "armhf" ]; then
lb chroot_devpts remove "$@"
lb chroot_sysfs remove "$@"
lb chroot_proc remove "$@"
rm -rf chroot/var/lib/initramfs-tools/*
Chroot chroot "apt-get -y purge crda wireless-regdb"
Chroot chroot "apt-get -y clean"
mv "${sourceslist}.orig" "${sourceslist}"
mv "${sourceslist}.d.orig" "${sourceslist}.d"
for file in $(find chroot/var/lib/apt/lists/ -name ftpmaster.internal*); do
rm $file
done
if [ -e chroot/etc/resolv.conf.orig ]; then
mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
else
rm chroot/etc/resolv.conf
fi
rm -rf chroot/boot/* || true
fi
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))