add build main configs

live-build/auto/build

@@ -329,8 +329,8 @@ if [ -e "binary/$INITFS/filesystem.packages-remove" ]; then
 	fi
 fi
 
-# 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
+# ubuntu-core and ubuntu-desktop-next 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
 if [ "$PROJECT" = "ubuntu-core" ] && [ "$SUBPROJECT" = "system-image" ]; then
     LB_LINUX_FLAVOURS=none
@@ -343,6 +343,13 @@ if [ "$PROJECT" = "ubuntu-core" ] && [ "$SUBPROJECT" = "system-image" ]; then
         mv device-azure.tar.gz "$PREFIX.azure.device.tar.gz"
     fi
 fi
+if [ "$PROJECT" = "ubuntu-desktop-next" ] && [ "$SUBPROJECT" = "system-image" ]; then
+    LB_LINUX_FLAVOURS=none
+
+    # rename to have the right prefix etc
+    mv device.tar.gz "$PREFIX.device.tar.gz"
+    
+fi
 
 for FLAVOUR in $LB_LINUX_FLAVOURS; do
 	if [ -z "$LB_LINUX_FLAVOURS" ] || [ "$LB_LINUX_FLAVOURS" = "none" ]; then

live-build/auto/config

@@ -210,6 +210,23 @@ case $PROJECT in
 		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
+			add_task install ubuntu-core
+
+			OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
+
+			# contains the framework definition
+			add_package install ubuntu-core-libs
+
+			# universe needed for 'system-image-cli'
+			COMPONENTS='main restricted universe'
+		fi
 		;;
 
 	kubuntu|kubuntu-dvd)