Drop ubuntu-desktop-next configs

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.588) UNRELEASED; urgency=medium
+
+  * Drop ubuntu-desktop-next configs
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 30 May 2019 12:00:40 +0100
+
 livecd-rootfs (2.587) eoan; urgency=medium
 
   * Strip translation files out of the minimal images, another thing that

debian/tests/default-bootstraps

@@ -32,8 +32,6 @@ ALL_TRIPLETS="
  ubuntu-core:system-image:ubuntu-core
  ubuntu-cpc::ubuntu-cpc
  ubuntu-cpc:minimized:ubuntu-cpc
- ubuntu-desktop-next:system-image:ubuntu-desktop-next
- ubuntu-desktop-next::ubuntu-desktop-next
  ubuntu-dvd::
  ubuntu-gnome::
  ubuntukylin::

live-build/auto/build

@@ -537,11 +537,11 @@ if [ -e "binary/$INITFS/filesystem.packages-remove" ]; then
 	fi
 fi
 
-# ubuntu-core and ubuntu-desktop-next splits kernel stuff into a "device" tarball so
+# ubuntu-core splits kernel stuff into a "device" tarball so
 # at this point we reset it to "none" as all the work to extract it was done already
 # in a binary hook
 case $PROJECT:${SUBPROJECT:-} in
-        ubuntu-core:system-image|ubuntu-desktop-next:system-image)
+        ubuntu-core:system-image)
 
     # create device tarball (for snappy only atm)
     if [ "$PROJECT:$SUBPROJECT" = "ubuntu-core:system-image" ]; then

live-build/auto/config

@@ -448,7 +448,7 @@ if [ "$PREINSTALLED" = "true" ]; then
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
-		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc|ubuntu-desktop-next)
+		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-touch-custom|ubuntu-cpc)
 			;;
 		*)
 			add_package live oem-config-gtk ubiquity-frontend-gtk
@@ -511,7 +511,7 @@ if ! [ -e config/germinate-output/structure ]; then
 fi
 
 case $PROJECT in
-        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)
+        base|edubuntu|edubuntu-dvd|kubuntu|kubuntu-active|kubuntu-dvd|kubuntu-plasma5|lubuntu|mythbuntu|ubuntu|ubuntu-budgie|ubuntu-dvd|ubuntu-gnome|ubuntu-mate|ubuntu-netbook|ubuntukylin|ubuntustudio-dvd|xubuntu)
 		INITRAMFS_COMPRESSION="lzma"
 		;;
 esac
@@ -548,25 +548,6 @@ case $PROJECT in
 		esac
 		;;
 
-	ubuntu-desktop-next)
-		add_task install minimal standard ubuntu-desktop-next ubuntu-sdk-libs
-		COMPONENTS='main restricted universe'
-		LIVE_TASK='ubuntu-touch-live'
-		KERNEL_FLAVOURS=generic
-		case $ARCH in
-			amd64)	add_package live linux-signed-generic ;;
-		esac
-
-		# system image snappy desktop next image
-		# mvo: This is for cron.daily-preinstalled
-		#      CDIMAGE_PREINSTALLED is not passed from build.py
-		#      and PREINSTALLED means something different. So
-		#      we use SUBPROJECT to pass on the information
-		if [ "${SUBPROJECT:-}" = "system-image" ]; then
-			OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
-		fi
-		;;
-
 	kubuntu|kubuntu-dvd)
 		add_task install minimal standard
 		add_task install kubuntu-desktop
@@ -1196,7 +1177,7 @@ EOF
 		fi
 		;;
 
-	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-desktop-next:system-image|ubuntu-cpc:*|ubuntu-server:live)
+	ubuntu-touch:*|ubuntu-touch-custom:*|ubuntu-core:system-image|ubuntu-cpc:*|ubuntu-server:live)
 		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/