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

Move from task-based installs to package-based installs, and switch

Browse Source 
to using the lts-utopic HWE kernel and X stack for all flavours.
This commit is contained in:
Adam Conrad 2015-02-02 01:44:19 -07:00
parent 1bbd4778e0
commit 2c6347c6f1
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,12 +1,17 @@
livecd-rootfs (2.208.2) UNRELEASED; urgency=medium livecd-rootfs (2.208.2) UNRELEASED; urgency=medium
[ Colin Watson ]
* If EXTRA_PPAS is set in the environment (as a space-separated sequence * If EXTRA_PPAS is set in the environment (as a space-separated sequence
of <ppa-owner>/<ppa-name> pairs), fetch signing keys for those from of <ppa-owner>/<ppa-name> pairs), fetch signing keys for those from
Launchpad using python3-software-properties, and add those PPAs when Launchpad using python3-software-properties, and add those PPAs when
building the live filesystem. This makes it easier for a builder to building the live filesystem. This makes it easier for a builder to
build an image against an additional PPA (LP: #1334374). build an image against an additional PPA (LP: #1334374).
-- Colin Watson <cjwatson@ubuntu.com> Thu, 26 Jun 2014 12:39:33 +0100 [ 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.
-- Adam Conrad <adconrad@ubuntu.com> Mon, 02 Feb 2015 01:43:48 -0700
livecd-rootfs (2.208.1) trusty; urgency=medium livecd-rootfs (2.208.1) trusty; urgency=medium

63
live-build/auto/config
View File

@ -182,9 +182,20 @@ case $BINARYFORMAT in
;; ;;
esac esac
# Default to lts-utopic for the point release, this is overridden later by
# specific projects/flavours:
case $ARCH in
powerpc)
KERNEL_FLAVOURS="powerpc-smp-lts-utopic powerpc64-smp-lts-utopic"
;;
*)
KERNEL_FLAVOURS="generic-lts-utopic"
;;
esac
case $PROJECT in case $PROJECT in
ubuntu|ubuntu-dvd) ubuntu|ubuntu-dvd)
add_task install minimal standard add_package install ubuntu-minimal ubuntu-standard
case "$ARCH+$SUBARCH" in case "$ARCH+$SUBARCH" in
armhf+omap4) armhf+omap4)
# Don't use the task as this drags in the regular X # Don't use the task as this drags in the regular X
@ -196,18 +207,18 @@ case $PROJECT in
xserver-xorg-input-evdev-omap-revert xserver-xorg-input-evdev-omap-revert
;; ;;
*) *)
add_task install ubuntu-desktop add_package install ubuntu-desktop
;; ;;
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 ;; amd64) add_package live linux-signed-generic-lts-utopic ;;
esac esac
;; ;;
kubuntu|kubuntu-dvd) kubuntu|kubuntu-dvd)
add_task install minimal standard add_package install ubuntu-minimal ubuntu-standard
case "$ARCH+$SUBARCH" in case "$ARCH+$SUBARCH" in
armhf+omap4) armhf+omap4)
# Don't use the task as this drags in the regular X # Don't use the task as this drags in the regular X
@ -219,75 +230,69 @@ case $PROJECT in
xserver-xorg-input-evdev-omap-revert xserver-xorg-input-evdev-omap-revert
;; ;;
*) *)
add_task install kubuntu-desktop add_package install kubuntu-desktop
;; ;;
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 ;; amd64) add_package live linux-signed-generic-lts-utopic ;;
esac esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
add_chroot_hook remove-gnome-icon-cache add_chroot_hook remove-gnome-icon-cache
;; ;;
kubuntu-active) kubuntu-active)
add_task install minimal standard kubuntu-active add_package install ubuntu-minimal ubuntu-standard kubuntu-active
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
;; ;;
edubuntu|edubuntu-dvd) edubuntu|edubuntu-dvd)
add_task install minimal standard ubuntu-desktop edubuntu-desktop-gnome add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop edubuntu-desktop-gnome
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 ;; amd64) add_package live linux-signed-generic-lts-utopic ;;
esac esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
xubuntu) xubuntu)
add_task install minimal standard xubuntu-desktop add_package install ubuntu-minimal ubuntu-standard xubuntu-desktop
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 ;; amd64) add_package live linux-signed-generic-lts-utopic ;;
esac esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;;
esac
;; ;;
ubuntu-netbook) ubuntu-netbook)
add_task install minimal standard ubuntu-netbook add_package install ubuntu-minimal ubuntu-standard ubuntu-netbook
LIVE_TASK='netbook-live' LIVE_TASK='netbook-live'
;; ;;
mythbuntu) mythbuntu)
add_task install minimal standard mythbuntu-desktop add_package install ubuntu-minimal ubuntu-standard mythbuntu-desktop
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 ;; amd64) add_package live linux-signed-generic-lts-utopic ;;
esac esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
;; ;;
lubuntu) lubuntu)
add_task install minimal standard lubuntu-desktop add_package install ubuntu-minimal ubuntu-standard lubuntu-desktop
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 ;; amd64) add_package live linux-signed-generic-lts-utopic ;;
esac esac
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;;
esac
# The Lubuntu STRUCTURE file has "feature # The Lubuntu STRUCTURE file has "feature
# no-follow-recommends". Mirror this. # no-follow-recommends". Mirror this.
@ -295,30 +300,30 @@ case $PROJECT in
;; ;;
ubuntu-gnome) ubuntu-gnome)
add_task install minimal standard ubuntu-gnome-desktop add_package install ubuntu-minimal ubuntu-standard ubuntu-gnome-desktop
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 ;; amd64) add_package live linux-signed-generic-lts-utopic ;;
esac esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
ubuntustudio-dvd) ubuntustudio-dvd)
add_task install minimal 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
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=lowlatency ;; amd64|i386) KERNEL_FLAVOURS=lowlatency-lts-utopic ;;
esac esac
;; ;;
ubuntukylin) ubuntukylin)
add_task install minimal standard ubuntu-desktop add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop
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 ;; amd64) add_package live linux-signed-generic-lts-utopic ;;
esac esac
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
;; ;;
@ -328,7 +333,7 @@ case $PROJECT in
;; ;;
ubuntu-server) ubuntu-server)
add_task install minimal add_package install ubuntu-minimal
COMPONENTS='main' COMPONENTS='main'
PREINSTALL_POOL_SEEDS='server-ship' PREINSTALL_POOL_SEEDS='server-ship'
;; ;;