From 0a1f08abfb6bd4a218779b6f3efc4b74289f93b4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 20 Mar 2012 17:52:44 +0000 Subject: [PATCH] On Lubuntu and Xubuntu, only use the generic kernel on amd64 and i386. --- debian/changelog | 6 ++++++ live-build/auto/config | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b4aa07d..2a70bb4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.62) UNRELEASED; urgency=low + + * On Lubuntu and Xubuntu, only use the generic kernel on amd64 and i386. + + -- Colin Watson Tue, 20 Mar 2012 17:52:09 +0000 + livecd-rootfs (2.61) precise; urgency=low [ Colin Watson ] diff --git a/live-build/auto/config b/live-build/auto/config index c83ab897..d7a61ef4 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -146,7 +146,9 @@ case $PROJECT in add_package install xterm LIVE_TASK='xubuntu-live' COMPONENTS='main restricted universe multiverse' - KERNEL_FLAVOURS=generic + case $ARCH in + amd64|i386) KERNEL_FLAVOURS=generic ;; + esac ;; ubuntu-netbook) @@ -164,7 +166,9 @@ case $PROJECT in add_task install minimal standard lubuntu-desktop LIVE_TASK='lubuntu-live' COMPONENTS='main restricted universe multiverse' - KERNEL_FLAVOURS=generic + case $ARCH in + amd64|i386) KERNEL_FLAVOURS=generic ;; + esac # The Lubuntu STRUCTURE file has "feature # no-follow-recommends". Mirror this.