releasing version 2.65.9

- Add some manual hints to work around slightly different dependency
    resolution for metapackages vs. tasks.

debian/changelog

@@ -1,3 +1,71 @@
+livecd-rootfs (2.65.9) precise; urgency=low
+
+  * Add xserver-xorg-lts-quantal to Mythbuntu amd64/i386 as well.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 15 Jan 2013 18:00:15 +0000
+
+livecd-rootfs (2.65.8) precise; urgency=low
+
+  * live-build/auto/config:
+    - Add some manual hints to work around slightly different dependency
+      resolution for metapackages vs. tasks.
+    - Use kernel and X enablement stacks for Mythbuntu amd64/i386 too.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 15 Jan 2013 17:31:16 +0000
+
+livecd-rootfs (2.65.7) precise; urgency=low
+
+  * live-build/auto/config: Build Ubuntu and Edubuntu images with X
+    enablement stack on amd64 and i386 (LP: #1098512).  Note that this
+    requires switching those images to be built largely using metapackages
+    rather than tasks.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Fri, 11 Jan 2013 10:59:29 +0000
+
+livecd-rootfs (2.65.6) precise; urgency=low
+
+  * live-build/auto/build: Use safer code for kernel handling that doesn't
+    cause failures under 'set -o pipefail' in ubuntu-defaults-image
+    (LP: #1097039).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 07 Jan 2013 21:31:39 +0000
+
+livecd-rootfs (2.65.5) precise-proposed; urgency=low
+
+  * Make sure the $PREFIX.kernel-$FLAVOUR.efi.signed output is
+    world-readable.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 04 Dec 2012 16:21:46 +0000
+
+livecd-rootfs (2.65.4) precise-proposed; urgency=low
+
+  * live-build/auto/config: Convince live-build to use the
+    -generic-lts-quantal kernels on Ubuntu/Edubuntu amd64/i386.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 03 Dec 2012 15:36:29 +0000
+
+livecd-rootfs (2.65.3) precise-proposed; urgency=low
+
+  * live-build/auto/config: Manually add linux-signed-generic-lts-quantal to
+    Ubuntu/Edubuntu amd64 builds, since nothing deals with updating Task
+    fields in the archive post-release.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 28 Nov 2012 16:45:59 +0000
+
+livecd-rootfs (2.65.2) precise-proposed; urgency=low
+
+  * live-build/auto/build: If they exist, link *.efi.signed versions of the
+    kernel to binary/$INITFS/kernel-$FLAVOUR.efi.signed (LP: #1075181).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 21 Nov 2012 22:34:30 +0000
+
+livecd-rootfs (2.65.1) precise-proposed; urgency=low
+
+  * live-build/auto/config: Emit sources.list entries for -proposed if the
+    environment variable PROPOSED is set (LP: #1019514).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 30 Jun 2012 07:22:25 +0100
+
 livecd-rootfs (2.65) precise; urgency=low
 
   * Add (extra-)override parsing to the preinstalled pool to make sure

live-build/auto/build

@@ -311,7 +311,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then
 		continue
 	fi
-	KVERS="$( (cd "binary/$INITFS"; ls vmlinu?-* 2>/dev/null || true) | sed -n "s/^vmlinu.-\\([^-]*-[^-]*-$FLAVOUR\\)$/\\1/p" )"
+	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
 			# already renamed by ubuntu-defaults-image
@@ -326,6 +326,10 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 		exit 1
 	fi
 	ln "binary/$INITFS/"vmlinu?-"$KVERS" "$PREFIX.kernel-$FLAVOUR"
+	if [ -e "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" ]; then
+		ln "binary/$INITFS/"vmlinu?-"$KVERS.efi.signed" "$PREFIX.kernel-$FLAVOUR.efi.signed"
+		chmod 644 "$PREFIX.kernel-$FLAVOUR.efi.signed"
+	fi
 	chmod 644 "$PREFIX.kernel-$FLAVOUR"
 	if [ -e "binary/$INITFS/initrd.img-$KVERS" ]; then
 		ln "binary/$INITFS/initrd.img-$KVERS" "$PREFIX.initrd-$FLAVOUR"

live-build/auto/config

@@ -125,8 +125,34 @@ esac
 
 case $PROJECT in
 	ubuntu|ubuntu-dvd)
+		case $ARCH in
+			amd64|i386)
+				# We have to use metapackages rather than
+				# tasks, so that the X enablement stack can
+				# be used rather than the normal stack.
+				# This changes dependency resolution
+				# sufficiently that some manual hints are
+				# needed.
+				add_package install ubuntu-minimal ubuntu-standard ubuntu-desktop libqt4-sql-sqlite notify-osd
+				add_package install xserver-xorg-lts-quantal
+				;;
+			*)
 				add_task install minimal standard ubuntu-desktop
+				;;
+		esac
 		LIVE_TASK='ubuntu-live'
+		# This should be done automatically, but nothing updates
+		# tasks post-release at the moment.
+		case $ARCH in
+			amd64)
+				add_package live linux-signed-generic-lts-quantal
+				;;
+		esac
+		case $ARCH in
+			amd64|i386)
+				KERNEL_FLAVOURS=generic-lts-quantal
+				;;
+		esac
 		;;
 
 	kubuntu|kubuntu-dvd)
@@ -141,9 +167,35 @@ case $PROJECT in
 		;;
 
 	edubuntu|edubuntu-dvd)
+		case $ARCH in
+			amd64|i386)
+				# We have to use metapackages rather than
+				# tasks, so that the X enablement stack can
+				# be used rather than the normal stack.
+				# This changes dependency resolution
+				# sufficiently that some manual hints are
+				# needed.
+				add_package install ubuntu-minimal ubuntu-standard edubuntu-desktop libqt4-sql-sqlite notify-osd
+				add_package install xserver-xorg-lts-quantal
+				;;
+			*)
 				add_task install minimal standard edubuntu-desktop-gnome
+				;;
+		esac
 		LIVE_TASK='edubuntu-live'
+		# This should be done automatically, but nothing updates
+		# tasks post-release at the moment.
+		case $ARCH in
+			amd64)
+				add_package live linux-signed-generic-lts-quantal
+				;;
+		esac
 		COMPONENTS='main restricted universe'
+		case $ARCH in
+			amd64|i386)
+				KERNEL_FLAVOURS=generic-lts-quantal
+				;;
+		esac
 		;;
 
 	xubuntu)
@@ -162,9 +214,28 @@ case $PROJECT in
 		;;
 
 	mythbuntu)
+		case $ARCH in
+			amd64|i386)
+				# We have to use metapackages rather than
+				# tasks, so that the X enablement stack can
+				# be used rather than the normal stack.
+				# This changes dependency resolution
+				# sufficiently that some manual hints are
+				# needed.
+				add_package install ubuntu-minimal ubuntu-standard mythbuntu-desktop notify-osd
+				add_package install xserver-xorg-lts-quantal
+				;;
+			*)
 				add_task install minimal standard mythbuntu-desktop
+				;;
+		esac
 		LIVE_TASK='mythbuntu-live'
 		COMPONENTS='main restricted universe multiverse'
+		case $ARCH in
+			amd64|i386)
+				KERNEL_FLAVOURS=generic-lts-quantal
+				;;
+		esac
 		;;
 
 	lubuntu)
@@ -275,6 +346,24 @@ lb config noauto \
 	--initramfs-compression lzma \
 	$OPTS
 
+# On some projects/architectures, we want to use backported kernels with
+# improved hardware enablement.  Unfortunately, live-build doesn't have very
+# good support for the way these are laid out: the metapackages are
+# *-generic-lts-*, but the files on disk are *-generic.  We need some
+# contortions to persuade it to do the right thing.
+case $KERNEL_FLAVOURS in
+	*-lts-*)
+		cat >> config/binary << EOF
+
+case \${0##*/} in
+	lb_binary*|build)
+		LB_LINUX_FLAVOURS="$(echo "$KERNEL_FLAVOURS" | sed 's/-lts-[^ ]*//')"
+		;;
+esac
+EOF
+		;;
+esac
+
 if $BINARY_REMOVE_LINUX; then
 	cat > config/binary_rootfs/excludes << EOF
 boot/vmlinu?-*
@@ -296,6 +385,16 @@ case $SUBPROJECT in
 		;;
 esac
 
+if [ "$PROPOSED" ]; then
+	. config/bootstrap
+
+	cat > config/archives/proposed.chroot.list << EOF
+deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed $LB_PARENT_ARCHIVE_AREAS
+EOF
+	cp -a config/archives/proposed.chroot.list \
+	      config/archives/proposed.binary.list
+fi
+
 case $PROJECT in
 	*-dvd)
 		. config/bootstrap
@@ -305,6 +404,11 @@ deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse
 deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse
 deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse
 EOF
+		if [ "$PROPOSED" ]; then
+			cat >> config/archives/dvd.binary.list << EOF
+deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed universe multiverse
+EOF
+		fi
 		;;
 esac