From 209b5d36c82009c461ee175d62c33a189450054f Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 19 Mar 2012 12:44:11 +0000 Subject: [PATCH] Use lowlatency for Ubuntu Studio amd64, since lowlatency-pae is i386-specific (LP: #959011). --- debian/changelog | 7 +++++++ live-build/auto/config | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7c762f6a..fdaec4fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.61) UNRELEASED; urgency=low + + * Use lowlatency for Ubuntu Studio amd64, since lowlatency-pae is + i386-specific (LP: #959011). + + -- Colin Watson Mon, 19 Mar 2012 12:43:28 +0000 + livecd-rootfs (2.60) precise; urgency=low * Use generic (non-PAE) kernel for Xubuntu (LP: #955009). diff --git a/live-build/auto/config b/live-build/auto/config index 8c4de083..df27d888 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -173,7 +173,10 @@ case $PROJECT in ubuntustudio-dvd) add_task install ubuntustudio-desktop ubuntustudio-generation ubuntustudio-recording ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-audio-plugins ubuntustudio-video COMPONENTS='main restricted universe multiverse' - KERNEL_FLAVOURS=lowlatency-pae + case $ARCH in + i386) KERNEL_FLAVOURS=lowlatency-pae ;; + amd64) KERNEL_FLAVOURS=lowlatency ;; + esac ;; base)