From b73e09ae5088c7b1c9adfa97be2ddbc010ab2c97 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Thu, 18 Aug 2011 11:55:54 +0200 Subject: [PATCH] Import patches-unapplied version 2.26 to ubuntu/oneiric Imported using git-ubuntu import. Changelog parent: 4236d780d05d59e02d79c8ae6e0685a503af5b09 New changelog entries: * make sure flash-kernel is not executed during build, this setting wasn't transitioned from livecd.sh yet --- debian/changelog | 7 +++++++ live-build/auto/config | 1 + 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index ee6b612d..0226b219 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.26) oneiric; urgency=low + + * make sure flash-kernel is not executed during build, this setting wasn't + transitioned from livecd.sh yet + + -- Oliver Grawert Thu, 18 Aug 2011 11:55:54 +0200 + livecd-rootfs (2.25) oneiric; urgency=low * include the md5 sum of the rootfs tarball in the initrd, so the installer diff --git a/live-build/auto/config b/live-build/auto/config index e1c80a69..9dc63310 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -185,6 +185,7 @@ esac case $ARCH in armel) KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" + FLASH_KERNEL_SKIP=1 case $SUBARCH in dove) BINARY_REMOVE_LINUX=false