Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 19:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Abstract the signed kernel image, so it's only defined in one spot.

Browse Source 
* Define HWE_X_PACKAGES required to install lts-utopic and use it.
This commit is contained in:
Adam Conrad 2015-02-02 02:43:19 -07:00
parent 2c6347c6f1
commit 3528438c85
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -10,6 +10,8 @@ livecd-rootfs (2.208.2) UNRELEASED; urgency=medium
[ Adam Conrad ] [ Adam Conrad ]
* Move from task-based installs to package-based installs, and switch * Move from task-based installs to package-based installs, and switch
to using the lts-utopic HWE kernel and X stack for all flavours. 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 <adconrad@ubuntu.com> Mon, 02 Feb 2015 01:43:48 -0700 -- Adam Conrad <adconrad@ubuntu.com> Mon, 02 Feb 2015 01:43:48 -0700

35
live-build/auto/config
View File

@ -192,6 +192,15 @@ case $ARCH in
KERNEL_FLAVOURS="generic-lts-utopic" KERNEL_FLAVOURS="generic-lts-utopic"
;; ;;
esac 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 case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
@ -208,12 +217,13 @@ case $PROJECT in
;; ;;
*) *)
add_package install ubuntu-desktop add_package install ubuntu-desktop
add_package install $HWE_X_PACKAGES
;; ;;
esac esac
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic-lts-utopic ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac
;; ;;
@ -231,12 +241,13 @@ case $PROJECT in
;; ;;
*) *)
add_package install kubuntu-desktop add_package install kubuntu-desktop
add_package install $HWE_X_PACKAGES
;; ;;
esac esac
LIVE_TASK='kubuntu-live' LIVE_TASK='kubuntu-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic-lts-utopic ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
add_chroot_hook remove-gnome-icon-cache add_chroot_hook remove-gnome-icon-cache
@ -244,6 +255,7 @@ case $PROJECT in
kubuntu-active) kubuntu-active)
add_package install ubuntu-minimal ubuntu-standard kubuntu-active add_package install ubuntu-minimal ubuntu-standard kubuntu-active
add_package install $HWE_X_PACKAGES
LIVE_TASK='kubuntu-active-live' LIVE_TASK='kubuntu-active-live'
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
add_chroot_hook remove-gnome-icon-cache add_chroot_hook remove-gnome-icon-cache
@ -251,21 +263,23 @@ case $PROJECT in
edubuntu|edubuntu-dvd) edubuntu|edubuntu-dvd)
add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop-gnome add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop-gnome
add_package install $HWE_X_PACKAGES
LIVE_TASK='edubuntu-live' LIVE_TASK='edubuntu-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic-lts-utopic ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
xubuntu) xubuntu)
add_package install ubuntu-minimal ubuntu-standard xubuntu-desktop add_package install ubuntu-minimal ubuntu-standard xubuntu-desktop
add_package install $HWE_X_PACKAGES
add_package install xterm add_package install xterm
LIVE_TASK='xubuntu-live' LIVE_TASK='xubuntu-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic-lts-utopic ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
@ -277,20 +291,22 @@ case $PROJECT in
mythbuntu) mythbuntu)
add_package install ubuntu-minimal ubuntu-standard mythbuntu-desktop add_package install ubuntu-minimal ubuntu-standard mythbuntu-desktop
add_package install $HWE_X_PACKAGES
LIVE_TASK='mythbuntu-live' LIVE_TASK='mythbuntu-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic-lts-utopic ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
lubuntu) lubuntu)
add_package install ubuntu-minimal ubuntu-standard lubuntu-desktop add_package install ubuntu-minimal ubuntu-standard lubuntu-desktop
add_package install $HWE_X_PACKAGES
LIVE_TASK='lubuntu-live' LIVE_TASK='lubuntu-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic-lts-utopic ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
@ -301,16 +317,18 @@ case $PROJECT in
ubuntu-gnome) ubuntu-gnome)
add_package install ubuntu-minimal ubuntu-standard ubuntu-gnome-desktop add_package install ubuntu-minimal ubuntu-standard ubuntu-gnome-desktop
add_package install $HWE_X_PACKAGES
LIVE_TASK='ubuntu-gnome-live' LIVE_TASK='ubuntu-gnome-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic-lts-utopic ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
ubuntustudio-dvd) 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 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' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=lowlatency-lts-utopic ;; amd64|i386) KERNEL_FLAVOURS=lowlatency-lts-utopic ;;
@ -319,11 +337,12 @@ case $PROJECT in
ubuntukylin) ubuntukylin)
add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop
add_package install $HWE_X_PACKAGES
add_package install ubuntukylin-default-settings add_package install ubuntukylin-default-settings
LIVE_TASK='ubuntu-live' LIVE_TASK='ubuntu-live'
LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
case $ARCH in case $ARCH in
amd64) add_package live linux-signed-generic-lts-utopic ;; amd64) add_package live $SIGNED_KERNEL_PACKAGE ;;
esac esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;