merge trunk

debian/changelog

@@ -1,10 +1,14 @@
-livecd-rootfs (2.526) UNRELEASED; urgency=medium
+livecd-rootfs (2.527) UNRELEASED; urgency=medium
 
   * Symlink systemd-networkd-wait-online to /bin/true in the live installer
     live session to avoid depending on buggy systemd behaviour.
 
  -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 30 Apr 2018 20:00:02 +1200
 
+livecd-rootfs (2.526) cosmic; urgency=medium
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 03 May 2018 23:18:52 -0500
+
 livecd-rootfs (2.525) bionic; urgency=medium
 
   * Don't fail to build CPC images if /lib/modules already exists in the

debian/tests/default-bootstraps

@@ -21,7 +21,6 @@ ALL_TRIPLETS="
  kubuntu-dvd::
  kubuntu-plasma5::
  lubuntu::
- lubuntu-next::
  mythbuntu::
  ubuntu::
  ubuntu-base::

live-build/auto/config

@@ -323,7 +323,7 @@ if ! [ -e config/germinate-output/structure ]; then
 fi
 
 case $PROJECT in
-        base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|lubuntu-next|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu)
+        base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-desktop-next|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu)
 		INITRAMFS_COMPRESSION="lzma"
 		;;
 esac
@@ -432,26 +432,6 @@ case $PROJECT in
 		case $ARCH in
 			amd64|i386)	KERNEL_FLAVOURS=generic ;;
 		esac
-
-		# The Lubuntu STRUCTURE file has "feature
-		# no-follow-recommends".  Mirror this.
-		APT_OPTIONS="${APT_OPTIONS} --no-install-recommends"
-		;;
-
-	lubuntu-next)
-		add_task install minimal standard lubuntu-qt-desktop
-		LIVE_TASK='lubuntu-live-qt'
-		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
-		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.
-		APT_OPTIONS="${APT_OPTIONS} --no-install-recommends"
 		;;
 
 	ubuntu-gnome)
@@ -671,15 +651,9 @@ esac
 # we'll expand the base seed given here according to the STRUCTURE file, and
 # then look in all of the seeds found to see which snaps are seeded
 case $PROJECT:${SUBPROJECT:-} in
-	ubuntu:*|kubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*)
+	ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*)
 		BASE_SEED='desktop'
 		;;
-	lubuntu-next:*)
-		BASE_SEED='desktop-qt'
-		;;
-	lubuntu:*)
-		BASE_SEED='desktop-gtk'
-		;;
 	ubuntu-server:live)
 		BASE_SEED='server'
 		# subiquity is seeded but in a separate squashfs via hooks; set HOOK_SNAPS and ALL_SNAPS.