From 5f2fbb762b0a7bcc03fb192583a366384d042513 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Fri, 15 Jul 2011 14:55:13 -0600 Subject: [PATCH] Import patches-unapplied version 2.17 to ubuntu/oneiric Imported using git-ubuntu import. Changelog parent: 648f92a9a6f8896723fa75c5d754907e8693f1f5 New changelog entries: * Only set KERNEL_FLAVOURS to SUBARCH if SUBARCH is already set. --- debian/changelog | 6 ++++++ live-build/auto/config | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e118104e..3c0b5c30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.17) oneiric; urgency=low + + * Only set KERNEL_FLAVOURS to SUBARCH if SUBARCH is already set. + + -- Adam Conrad Fri, 15 Jul 2011 14:55:13 -0600 + livecd-rootfs (2.16) oneiric; urgency=low * Add support for building new "ubuntu-core" rootfs tarballs: diff --git a/live-build/auto/config b/live-build/auto/config index b41fbc81..ea017404 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -171,7 +171,7 @@ esac case $ARCH in armel) - KERNEL_FLAVOURS="$SUBARCH" + KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" case $SUBARCH in dove) BINARY_REMOVE_LINUX=false