From 3528438c852aed721703845d70849cfaae59aa05 Mon Sep 17 00:00:00 2001 From: Adam Conrad Date: Mon, 2 Feb 2015 02:43:19 -0700 Subject: [PATCH] * Abstract the signed kernel image, so it's only defined in one spot. * Define HWE_X_PACKAGES required to install lts-utopic and use it. --- debian/changelog | 2 ++ live-build/auto/config | 35 +++++++++++++++++++++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index d7a0e2da..f784dae3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ livecd-rootfs (2.208.2) UNRELEASED; urgency=medium [ Adam Conrad ] * Move from task-based installs to package-based installs, and switch to using the lts-utopic HWE kernel and X stack for all flavours. + * Abstract the signed kernel image, so it's only defined in one spot. + * Define HWE_X_PACKAGES required to install lts-utopic and use it. -- Adam Conrad Mon, 02 Feb 2015 01:43:48 -0700 diff --git a/live-build/auto/config b/live-build/auto/config index f03a508d..1e7fbd57 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -192,6 +192,15 @@ case $ARCH in KERNEL_FLAVOURS="generic-lts-utopic" ;; esac +case $ARCH in + i386) + HWE_X_PACKAGES="xserver-xorg-lts-utopic libegl1-mesa-drivers-lts-utopic xserver-xorg-video-all-lts-utopic xserver-xorg-video-geode-lts-utopic" + ;; + *) + HWE_X_PACKAGES="xserver-xorg-lts-utopic libegl1-mesa-drivers-lts-utopic xserver-xorg-video-all-lts-utopic" + ;; +esac +SIGNED_KERNEL_PACKAGE="linux-signed-generic-lts-utopic" case $PROJECT in ubuntu|ubuntu-dvd) @@ -208,12 +217,13 @@ case $PROJECT in ;; *) add_package install ubuntu-desktop + add_package install $HWE_X_PACKAGES ;; esac LIVE_TASK='ubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic-lts-utopic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac ;; @@ -231,12 +241,13 @@ case $PROJECT in ;; *) add_package install kubuntu-desktop + add_package install $HWE_X_PACKAGES ;; esac LIVE_TASK='kubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic-lts-utopic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac COMPONENTS='main restricted universe' add_chroot_hook remove-gnome-icon-cache @@ -244,6 +255,7 @@ case $PROJECT in kubuntu-active) add_package install ubuntu-minimal ubuntu-standard kubuntu-active + add_package install $HWE_X_PACKAGES LIVE_TASK='kubuntu-active-live' COMPONENTS='main restricted universe' add_chroot_hook remove-gnome-icon-cache @@ -251,21 +263,23 @@ case $PROJECT in edubuntu|edubuntu-dvd) add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop-gnome + add_package install $HWE_X_PACKAGES LIVE_TASK='edubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic-lts-utopic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac COMPONENTS='main restricted universe' ;; xubuntu) add_package install ubuntu-minimal ubuntu-standard xubuntu-desktop + add_package install $HWE_X_PACKAGES add_package install xterm LIVE_TASK='xubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic-lts-utopic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac COMPONENTS='main restricted universe multiverse' ;; @@ -277,20 +291,22 @@ case $PROJECT in mythbuntu) add_package install ubuntu-minimal ubuntu-standard mythbuntu-desktop + add_package install $HWE_X_PACKAGES LIVE_TASK='mythbuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic-lts-utopic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac COMPONENTS='main restricted universe multiverse' ;; lubuntu) add_package install ubuntu-minimal ubuntu-standard lubuntu-desktop + add_package install $HWE_X_PACKAGES LIVE_TASK='lubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic-lts-utopic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac COMPONENTS='main restricted universe multiverse' @@ -301,16 +317,18 @@ case $PROJECT in ubuntu-gnome) add_package install ubuntu-minimal ubuntu-standard ubuntu-gnome-desktop + add_package install $HWE_X_PACKAGES LIVE_TASK='ubuntu-gnome-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic-lts-utopic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac COMPONENTS='main restricted universe' ;; ubuntustudio-dvd) add_package install ubuntu-minimal ubuntu-standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-font-meta ubuntustudio-graphics ubuntustudio-video ubuntustudio-publishing ubuntustudio-photography + add_package install $HWE_X_PACKAGES COMPONENTS='main restricted universe multiverse' case $ARCH in amd64|i386) KERNEL_FLAVOURS=lowlatency-lts-utopic ;; @@ -319,11 +337,12 @@ case $PROJECT in ubuntukylin) add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop + add_package install $HWE_X_PACKAGES add_package install ubuntukylin-default-settings LIVE_TASK='ubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic-lts-utopic ;; + amd64) add_package live $SIGNED_KERNEL_PACKAGE ;; esac COMPONENTS='main restricted universe' ;;