* Add xserver-xorg-core-lts-vivid to X HWE hints for the resolver.

* Add libwayland-egl1-mesa-lts-vivid to X HWE hints (LP: #1479524)
* Add kde-window-manager to kubuntu hints to fix a resolver issue.
* Add thermald to lubuntu hints to work around lack of recommends.

debian/changelog

@@ -1,3 +1,86 @@
+livecd-rootfs (2.208.8) trusty; urgency=medium
+
+  * Add xserver-xorg-core-lts-vivid to X HWE hints for the resolver.
+  * Add libwayland-egl1-mesa-lts-vivid to X HWE hints (LP: #1479524)
+  * Add kde-window-manager to kubuntu hints to fix a resolver issue.
+  * Add thermald to lubuntu hints to work around lack of recommends.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 28 Jul 2015 20:06:52 -0600
+
+livecd-rootfs (2.208.7) trusty; urgency=medium
+
+  * live-build/auto/config: Switch HWE from lts-utopic to lts-vivid.
+  * Remove obsolete libegl1-mesa-drivers-lts-* from HWE_X_PACKAGES.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 22 Jun 2015 14:07:52 -0600
+
+livecd-rootfs (2.208.6) trusty; urgency=medium
+
+  * Add audacious-plugins to LUBUNTU_HWE_HINTS to unsnag the PPC build.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 18 Feb 2015 12:00:36 -0700
+
+livecd-rootfs (2.208.5) trusty; urgency=medium
+
+  * Explicitly install the xserver-xorg-input-all-lts-utopic package.
+  * Rename XUBUNTU_HWE_HINTS to XFCE_HWE_HINTS, so it's more reusable
+    and have MYTHBUNTU, XUBUNTU, and UBUNTUSTUDIO all make use of it.
+  * Explicitly seed the correct notify option for every last flavour.
+  * Remove xscreensaver-data and xscreensaver with XUBUNTU_HWE_HINTS.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 17 Feb 2015 13:57:51 -0700
+
+livecd-rootfs (2.208.4) trusty; urgency=medium
+
+  * Use the correct metapackage for edubuntu-desktop, and add HWE_HINTS
+  * Add KUBUNTU_HWE_HINTS and populate to work around task->meta change
+  * Revert lubuntu to using tasks for minimal and standard, since their
+    unique snowflake apt --no-install-recommends setup breaks switching
+  * Add XUBUNTU_HWE_HINTS and populate to work around task->meta change
+  * Add UBUNTUGNOME_HWE_HINTS and populate it skip using unity packages
+  * Add LUBUNTU_HWE_HINTS and populate to work around task->meta change
+  * Reuse XUBUNTU_HWE_HINTS for MYTHBUNTU_HWE_HINTS and add some tweaks
+  * Also reuse XUBUNTU_HWE_HINTS for UBUNTUSTUDIO_HWE_HINTS with tweaks
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Wed, 04 Feb 2015 04:42:54 -0700
+
+livecd-rootfs (2.208.3) trusty; urgency=medium
+
+  * Pull xserver-xorg-video-geode-lts-utopic out of the i386 images.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Tue, 03 Feb 2015 07:03:03 -0700
+
+livecd-rootfs (2.208.2) trusty; urgency=medium
+
+  [ Colin Watson ]
+  * 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
+    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).
+
+  [ 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.
+  * Before trying to copy kernels around, cut -lts* off the end of FLAVOUR,
+    since the actual files on disk are -generic, not -generic-lts-utopic.
+  * Define HWE_X_PACKAGES required to install lts-utopic and use it.
+  * Define UNITY_HWE_HINTS to hint correct alternative package selections. 
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 02 Feb 2015 01:43:48 -0700
+
+livecd-rootfs (2.208.1) trusty; urgency=medium
+
+  * Install linux-signed-generic directly in live passes rather than relying
+    on it being in the corresponding tasks.  linux-signed-generic shouldn't
+    be in a task because that expands to ABI-versioned packages, and tasks
+    can't be updated post-release.
+  * Filter out kernel packages that mistakenly ended up in live tasks, so
+    that we can install updated versions separately (LP: #1325281).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 24 Jun 2014 14:51:03 +0100
+
 livecd-rootfs (2.208) trusty; urgency=medium
 
   * Adding support for ubuntu-touch i386 based images

debian/control

@@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk
 
 Package: livecd-rootfs
 Architecture: any
-Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1), android-tools-fsutils [armhf]
+Depends: ${misc:Depends}, debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes, lsb-release, lzma, e2fsprogs, germinate (>= 1.25.1), apt-utils, gnupg, live-build (>= 3.0~a55-1), android-tools-fsutils [armhf], python3-software-properties
 Suggests: partimage
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs

debian/install

@@ -1 +1,2 @@
 live-build usr/share/livecd-rootfs
+get-ppa-fingerprint usr/share/livecd-rootfs

get-ppa-fingerprint

@@ -0,0 +1,16 @@
+#! /usr/bin/python3
+
+from __future__ import print_function
+
+from optparse import OptionParser
+
+from softwareproperties import ppa
+
+
+parser = OptionParser(usage="%prog OWNER/NAME")
+_, args = parser.parse_args()
+if not args:
+    parser.error("must provide a PPA owner/name")
+owner_name, ppa_name = args[0].split("/")
+ppa_info = ppa.get_ppa_info_from_lp(owner_name, ppa_name)
+print(ppa_info["signing_key_fingerprint"])

live-build/auto/build

@@ -328,6 +328,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
 		continue
 	fi
+	FLAVOUR=${FLAVOUR%%-lts-*}
 	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | (fgrep -v .efi || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
 	if [ -z "$KVERS" ]; then
 		if [ -e "binary/$INITFS/vmlinuz" ]; then
@@ -357,6 +358,7 @@ done
 NUMFLAVOURS="$(set -- $LB_LINUX_FLAVOURS; echo $#)"
 if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then
 	# only one kernel flavour
+	FLAVOUR=${LB_LINUX_FLAVOURS%%-lts-*}
 	if [ -e "binary/$INITFS/vmlinuz" ]; then
 		ln "binary/$INITFS/vmlinuz" "$PREFIX.kernel"
 	else

live-build/auto/config

@@ -39,8 +39,17 @@ add_task ()
 {
 	local pass="$1"
 	shift
+	local filter=
 	local task
 
+	if [ "$1" = --filter ]; then
+		# Add an extra layer of backslash-quoting to anything that's
+		# already backslash-quoted, since it will need to pass
+		# through eval.
+		filter="$(printf %s "$2" | sed 's/\(\\.\)/\\\\\1/g')"
+		shift 2
+	fi
+
 	# The removal of direct task installation support from live-build
 	# poses some problems.  If the chroot has multiarch configured - for
 	# example, if we're building for amd64 - then dumpavail will show
@@ -60,7 +69,7 @@ add_task ()
 	for task; do
 		# We need a ridiculous number of backslashes to protect
 		# parentheses from eval.
-		echo "!chroot chroot apt-cache dumpavail | grep-dctrl -nsPackage \\\\\\( -XFArchitecture $ARCH -o -XFArchitecture all \\\\\\) -a -wFTask $task" >> "config/package-lists/livecd-rootfs.list.chroot_$pass"
+		echo "!chroot chroot apt-cache dumpavail | grep-dctrl -nsPackage \\\\\\( -XFArchitecture $ARCH -o -XFArchitecture all \\\\\\) -a -wFTask $task${filter:+ -a $filter}" >> "config/package-lists/livecd-rootfs.list.chroot_$pass"
 	done
 }
 
@@ -84,6 +93,7 @@ SOURCE='--source false'
 BOOTLOADER=none
 BOOTAPPEND_LIVE=
 LIVE_TASK=
+LIVE_TASK_FILTER=
 PREINSTALLED=false
 PREINSTALL_POOL=
 PREINSTALL_POOL_SEEDS=
@@ -172,9 +182,31 @@ case $BINARYFORMAT in
 		;;
 esac
 
+# Default to lts-vivid for the point release, this is overridden later by
+# specific projects/flavours:
+case $ARCH in
+	powerpc)
+		KERNEL_FLAVOURS="powerpc-smp-lts-vivid powerpc64-smp-lts-vivid"
+		;;
+	*)
+		KERNEL_FLAVOURS="generic-lts-vivid"
+		;;
+esac
+HWE_X_PACKAGES="xserver-xorg-core-lts-vivid xserver-xorg-lts-vivid xserver-xorg-video-all-lts-vivid xserver-xorg-input-all-lts-vivid libwayland-egl1-mesa-lts-vivid"
+SIGNED_KERNEL_PACKAGE="linux-signed-generic-lts-vivid"
+UNITY_HWE_HINTS="unity-settings-daemon notify-osd libqt4-sql-sqlite unity gnome-terminal"
+KUBUNTU_HWE_HINTS="pinentry-qt4 kde-baseapps-bin kde-window-manager"
+EDUBUNTU_HWE_HINTS="gnome-session gnome-terminal"
+XFCE_HWE_HINTS="lightdm-gtk-greeter unity-settings-daemon- unity-control-center- notification-daemon- libpanel-applet-4-0-"
+LUBUNTU_HWE_HINTS="xfce4-notifyd xterm notification-daemon- audacious-plugins thermald"
+UBUNTUGNOME_HWE_HINTS="unity-settings-daemon- unity-control-center- libaccount-plugin-1.0-0-"
+XUBUNTU_HWE_HINTS="xfce4-notifyd xscreensaver-data- $XFCE_HWE_HINTS"
+MYTHBUNTU_HWE_HINTS="notify-osd $XFCE_HWE_HINTS"
+UBUNTUSTUDIO_HWE_HINTS="xfce4-notifyd $XFCE_HWE_HINTS"
+
 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
@@ -186,14 +218,19 @@ case $PROJECT in
 					xserver-xorg-input-evdev-omap-revert 
 				;;
 			*)
-				add_task install ubuntu-desktop
+				add_package install ubuntu-desktop $UNITY_HWE_HINTS
+				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 $SIGNED_KERNEL_PACKAGE ;;
+		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
@@ -205,55 +242,76 @@ case $PROJECT in
 					xserver-xorg-input-evdev-omap-revert 
 				;;
 			*)
-				add_task install kubuntu-desktop
+				add_package install kubuntu-desktop $KUBUNTU_HWE_HINTS
+				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 $SIGNED_KERNEL_PACKAGE ;;
+		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
+		add_package install $HWE_X_PACKAGES
 		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 $UNITY_HWE_HINTS $EDUBUNTU_HWE_HINTS
+		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 $SIGNED_KERNEL_PACKAGE ;;
+		esac
 		COMPONENTS='main restricted universe'
 		;;
 
 	xubuntu)
-		add_task install minimal standard xubuntu-desktop
+		add_package install ubuntu-minimal ubuntu-standard xubuntu-desktop $XUBUNTU_HWE_HINTS
+		add_package install $HWE_X_PACKAGES
 		add_package install xterm
 		LIVE_TASK='xubuntu-live'
-		COMPONENTS='main restricted universe multiverse'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
 		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
+			amd64)	add_package live $SIGNED_KERNEL_PACKAGE ;;
 		esac
+		COMPONENTS='main restricted universe multiverse'
 		;;
 
 	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 $MYTHBUNTU_HWE_HINTS
+		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 $SIGNED_KERNEL_PACKAGE ;;
+		esac
 		COMPONENTS='main restricted universe multiverse'
 		;;
 
 	lubuntu)
-		add_task install minimal standard lubuntu-desktop
+		add_task install minimal standard
+		add_package install lubuntu-desktop $LUBUNTU_HWE_HINTS
+		add_package install $HWE_X_PACKAGES
 		LIVE_TASK='lubuntu-live'
-		COMPONENTS='main restricted universe multiverse'
+		LIVE_TASK_FILTER='--not -Pe ^linux-\(headers\|image\|signed\)'
 		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
+			amd64)	add_package live $SIGNED_KERNEL_PACKAGE ;;
 		esac
+		COMPONENTS='main restricted universe multiverse'
 
 		# The Lubuntu STRUCTURE file has "feature
 		# no-follow-recommends".  Mirror this.
@@ -261,23 +319,34 @@ case $PROJECT in
 		;;
 
 	ubuntu-gnome)
-		add_task install minimal standard ubuntu-gnome-desktop
+		add_package install ubuntu-minimal ubuntu-standard ubuntu-gnome-desktop $UBUNTUGNOME_HWE_HINTS
+		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 $SIGNED_KERNEL_PACKAGE ;;
+		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 $UBUNTUSTUDIO_HWE_HINTS
+		add_package install $HWE_X_PACKAGES
 		COMPONENTS='main restricted universe multiverse'
 		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=lowlatency ;;
+			amd64|i386)	KERNEL_FLAVOURS=lowlatency-lts-vivid ;;
 		esac
 		;;
 
 	ubuntukylin)
-		add_task install minimal standard ubuntu-desktop
+		add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop $UNITY_HWE_HINTS
+		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 $SIGNED_KERNEL_PACKAGE ;;
+		esac
 		COMPONENTS='main restricted universe'
 		;;
 
@@ -286,7 +355,7 @@ case $PROJECT in
 		;;
 
 	ubuntu-server)
-		add_task install minimal
+		add_package install ubuntu-minimal
 		COMPONENTS='main'
 		PREINSTALL_POOL_SEEDS='server-ship'
 		;;
@@ -316,17 +385,17 @@ case $PROJECT in
 esac
 
 if [ "$PREINSTALLED" != "true" ] && [ "$LIVE_TASK" ]; then
-	add_task live "$LIVE_TASK"
+	add_task live ${LIVE_TASK_FILTER:+--filter "$LIVE_TASK_FILTER"} "$LIVE_TASK"
 fi
 
 case $PROJECT in
 	ubuntu-dvd)
 		add_task install ubuntu-usb
-		add_task live ubuntu-usb-live
+		add_task live ${LIVE_TASK_FILTER:+--filter "$LIVE_TASK_FILTER"} ubuntu-usb-live
 		;;
 
 	*-dvd)
-		add_task live "$PROJECT-live"
+		add_task live ${LIVE_TASK_FILTER:+--filter "$LIVE_TASK_FILTER"} "$PROJECT-live"
 		;;
 esac
 
@@ -490,6 +559,45 @@ EOF
 		;;
 esac
 
+if [ "$EXTRA_PPAS" ]; then
+	rm -f config/archives/extra-ppas.list.chroot \
+	      config/archives/extra-ppas.key.chroot
+	gpg_tmpdir="$(mktemp -d)"
+	run_gpg () {
+		gpg --no-default-keyring --no-options --homedir "$gpg_tmpdir" \
+			--secret-keyring "$gpg_tmpdir/secring.gpg" \
+			--keyserver hkp://keyserver.ubuntu.com:80/ \
+			"$@"
+	}
+	for extra_ppa in $EXTRA_PPAS; do
+		extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"
+		echo "deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main" >> config/archives/extra-ppas.list.chroot
+		run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \
+			--recv "$extra_ppa_fingerprint"
+		run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \
+			--output "$gpg_tmpdir/export.gpg" \
+			--export "$extra_ppa_fingerprint"
+		got_fingerprint="$(
+			run_gpg --keyring "$gpg_tmpdir/export.gpg" \
+				--fingerprint --batch --with-colons |
+			grep '^fpr:' | cut -d: -f10)"
+		if [ "$got_fingerprint" != "$extra_ppa_fingerprint" ]; then
+			echo "Fingerprints do not match.  Got:" >&2
+			echo "$got_fingerprint" | sed 's/^/  /' >&2
+			echo "Expected:" >&2
+			echo "  $extra_ppa_fingerprint" >&2
+			exit 1
+		fi
+		cat "$gpg_tmpdir/export.gpg" >> config/archives/extra-ppas.key.chroot
+		rm -f "$gpg_tmpdir/export.gpg"
+	done
+	rm -rf "$gpg_tmpdir"
+	cp -a config/archives/extra-ppas.list.chroot \
+	      config/archives/extra-ppas.list.binary
+	cp -a config/archives/extra-ppas.key.chroot \
+	      config/archives/extra-ppas.key.binary
+fi
+
 # cribbed from cdimage, perhaps this should be a small helper script in germinate?
 add_inheritance () {
 	case " $inherit " in