diff --git a/debian/changelog b/debian/changelog index bb83b18b..d7a0e2da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,17 @@ livecd-rootfs (2.208.2) UNRELEASED; urgency=medium + [ Colin Watson ] * If EXTRA_PPAS is set in the environment (as a space-separated sequence of / pairs), fetch signing keys for those from Launchpad using python3-software-properties, and add those PPAs when building the live filesystem. This makes it easier for a builder to build an image against an additional PPA (LP: #1334374). - -- Colin Watson 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 Mon, 02 Feb 2015 01:43:48 -0700 livecd-rootfs (2.208.1) trusty; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index 0e2f735a..f03a508d 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -182,9 +182,20 @@ case $BINARYFORMAT in ;; 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 ubuntu|ubuntu-dvd) - add_task install minimal standard + add_package install ubuntu-minimal ubuntu-standard case "$ARCH+$SUBARCH" in armhf+omap4) # 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 ;; *) - add_task install ubuntu-desktop + add_package install ubuntu-desktop ;; esac LIVE_TASK='ubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic ;; + amd64) add_package live linux-signed-generic-lts-utopic ;; esac ;; kubuntu|kubuntu-dvd) - add_task install minimal standard + add_package install ubuntu-minimal ubuntu-standard case "$ARCH+$SUBARCH" in armhf+omap4) # 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 ;; *) - add_task install kubuntu-desktop + add_package install kubuntu-desktop ;; esac LIVE_TASK='kubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic ;; + amd64) add_package live linux-signed-generic-lts-utopic ;; esac COMPONENTS='main restricted universe' add_chroot_hook remove-gnome-icon-cache ;; kubuntu-active) - add_task install minimal standard kubuntu-active + add_package install ubuntu-minimal ubuntu-standard kubuntu-active LIVE_TASK='kubuntu-active-live' COMPONENTS='main restricted universe' add_chroot_hook remove-gnome-icon-cache ;; 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_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic ;; + amd64) add_package live linux-signed-generic-lts-utopic ;; esac COMPONENTS='main restricted universe' ;; xubuntu) - add_task install minimal standard xubuntu-desktop + add_package install ubuntu-minimal ubuntu-standard xubuntu-desktop 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 ;; + amd64) add_package live linux-signed-generic-lts-utopic ;; esac COMPONENTS='main restricted universe multiverse' - case $ARCH in - amd64|i386) KERNEL_FLAVOURS=generic ;; - esac ;; ubuntu-netbook) - add_task install minimal standard ubuntu-netbook + add_package install ubuntu-minimal ubuntu-standard ubuntu-netbook LIVE_TASK='netbook-live' ;; mythbuntu) - add_task install minimal standard mythbuntu-desktop + add_package install ubuntu-minimal ubuntu-standard mythbuntu-desktop LIVE_TASK='mythbuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic ;; + amd64) add_package live linux-signed-generic-lts-utopic ;; esac COMPONENTS='main restricted universe multiverse' ;; lubuntu) - add_task install minimal standard lubuntu-desktop + add_package install ubuntu-minimal ubuntu-standard lubuntu-desktop LIVE_TASK='lubuntu-live' LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic ;; + amd64) add_package live linux-signed-generic-lts-utopic ;; esac COMPONENTS='main restricted universe multiverse' - case $ARCH in - amd64|i386) KERNEL_FLAVOURS=generic ;; - esac # The Lubuntu STRUCTURE file has "feature # no-follow-recommends". Mirror this. @@ -295,30 +300,30 @@ case $PROJECT in ;; 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_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)' case $ARCH in - amd64) add_package live linux-signed-generic ;; + amd64) add_package live linux-signed-generic-lts-utopic ;; esac COMPONENTS='main restricted universe' ;; 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' case $ARCH in - amd64|i386) KERNEL_FLAVOURS=lowlatency ;; + amd64|i386) KERNEL_FLAVOURS=lowlatency-lts-utopic ;; esac ;; ubuntukylin) - add_task install minimal standard ubuntu-desktop + add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop 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 ;; + amd64) add_package live linux-signed-generic-lts-utopic ;; esac COMPONENTS='main restricted universe' ;; @@ -328,7 +333,7 @@ case $PROJECT in ;; ubuntu-server) - add_task install minimal + add_package install ubuntu-minimal COMPONENTS='main' PREINSTALL_POOL_SEEDS='server-ship' ;;