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

Import patches-unapplied version 2.34 to ubuntu/oneiric

Browse Source 
Imported using git-ubuntu import.

Changelog parent: d6f140ca28935da53e2c052ceb0fd8e5d41b788c

New changelog entries:
  * drop FLASH_KERNEL_SKIP from live-build config, flash-kernel suppression is 
    handled through a diversion already.
  * add FLASH_KERNEL_SKIP explicitly to the post build ac100 update-initramfs 
    chroot call.
This commit is contained in:
Oliver Grawert 2011-08-24 14:16:55 +02:00 committed by usd-importer
parent d6f140ca28
commit 137f2a72d4
3 changed files with 10 additions and 2 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.34) oneiric; urgency=low
* drop FLASH_KERNEL_SKIP from live-build config, flash-kernel suppression is
handled through a diversion already.
* add FLASH_KERNEL_SKIP explicitly to the post build ac100 update-initramfs
chroot call.
-- Oliver Grawert <ogra@ubuntu.com> Wed, 24 Aug 2011 14:16:55 +0200
livecd-rootfs (2.33) oneiric; urgency=low livecd-rootfs (2.33) oneiric; urgency=low
* BuildLiveCD: Add the subproject (if any) and the ubuntu-defaults-image * BuildLiveCD: Add the subproject (if any) and the ubuntu-defaults-image

2
live-build/auto/build
View File

@ -193,7 +193,7 @@ if [ "$SUBARCH" = "ac100" ]; then
lb chroot_devpts install "$@" lb chroot_devpts install "$@"
# re-create initrd to contain the installer.md5 file # re-create initrd to contain the installer.md5 file
Chroot chroot "update-initramfs -k all -t -u -v" Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k all -t -u -v"
# create boot.img # create boot.img
Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}" Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}"

1
live-build/auto/config
View File

@ -190,7 +190,6 @@ esac
case $ARCH in case $ARCH in
armel) armel)
KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
FLASH_KERNEL_SKIP=1
case $SUBARCH in case $SUBARCH in
dove) dove)
BINARY_REMOVE_LINUX=false BINARY_REMOVE_LINUX=false