From baf4f47379ebdb81875ffa09ef3a345ee1114306 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Mon, 9 May 2016 16:31:57 -0700
Subject: [PATCH] Drop special-casing of ubuntu-core:system-image in places,
 now that ubuntu-core unambiguously refers to the snappy Ubuntu Core image.

---
 debian/changelog       |   2 +
 live-build/auto/config | 122 +++++++++++++++++++----------------------
 2 files changed, 57 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7708eb04..31b3f0f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 livecd-rootfs (2.410) UNRELEASED; urgency=medium
 
   * Rename old ubuntu-core tarballs to ubuntu-base to avoid confusion.
+  * Drop special-casing of ubuntu-core:system-image in places, now that
+    ubuntu-core unambiguously refers to the snappy Ubuntu Core image.
 
  -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 09 May 2016 15:02:22 -0700
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 12a72dc1..0621058b 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -350,66 +350,60 @@ case $PROJECT in
 		;;
 
 	ubuntu-core)
-		# 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 }--apt-recommends false"
-
-			# some workarounds because the seeds are not quite
-			# corrent at the moment
-			add_package install dbus
-			add_package install isc-dhcp-client
-			add_package install libpam-systemd
-			add_package install ppp
-			add_package install watchdog
-			# no Task: header yet
-			add_package install snapd
-			add_package install ubuntu-core-snapd-units
-
-			# no minimal as we want to be really minimal
-			#add_task install minimal
-			add_task install ubuntu-core
-
-                        # more packages are pulled in via the seed.
-                        # (important to remember when comparing to the
-                        #  livecd-rootfs from ppa:snappy-dev/image)
+		OPTS="${OPTS:+$OPTS }--apt-recommends false"
 
-			case $ARCH in
-				i386)
-					# efi support can go once the task
-					# header is available for grub-efi-ia32-bin
-					add_package install grub-efi-ia32-bin
-					;;
-			esac
+		# some workarounds because the seeds are not quite
+		# corrent at the moment
+		add_package install dbus
+		add_package install isc-dhcp-client
+		add_package install libpam-systemd
+		add_package install ppp
+		add_package install watchdog
+		# no Task: header yet
+		add_package install snapd
+		add_package install ubuntu-core-snapd-units
+
+		# no minimal as we want to be really minimal
+		#add_task install minimal
+		add_task install ubuntu-core
+
+                # more packages are pulled in via the seed.
+                # (important to remember when comparing to the
+                #  livecd-rootfs from ppa:snappy-dev/image)
 
-			# generic kernel etc
-			KERNEL_FLAVOURS=none
-			case $ARCH in
-				i386)
-					add_package install grub-pc
-					;;
-				amd64)
-					add_package install grub-pc-bin
-					add_package install grub-efi-amd64-signed
-					add_package install shim-signed
-					;;
-				armhf)
-					add_package install flash-kernel u-boot-tools
-					;;
-				arm64)
-					add_package install u-boot-tools
-                                        ;;
-			esac
-			OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
+		case $ARCH in
+			i386)
+				# efi support can go once the task
+				# header is available for grub-efi-ia32-bin
+				add_package install grub-efi-ia32-bin
+				;;
+		esac
 
-			# contains the framework definition
-			add_package install ubuntu-core-libs
+		# generic kernel etc
+		KERNEL_FLAVOURS=none
+		case $ARCH in
+			i386)
+				add_package install grub-pc
+				;;
+			amd64)
+				add_package install grub-pc-bin
+				add_package install grub-efi-amd64-signed
+				add_package install shim-signed
+				;;
+			armhf)
+				add_package install flash-kernel u-boot-tools
+				;;
+			arm64)
+				add_package install u-boot-tools
+                                ;;
+		esac
+		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
 
-			# universe needed for 'system-image-cli' and multiverse for firmware
-			COMPONENTS='main restricted universe multiverse'
-		fi
+		# contains the framework definition
+		add_package install ubuntu-core-libs
+
+		# universe needed for 'system-image-cli' and multiverse for firmware
+		COMPONENTS='main restricted universe multiverse'
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
@@ -561,17 +555,11 @@ case $ARCH in
 esac
 
 case $PROJECT in
-	ubuntu-server|ubuntu-core|ubuntu-base|ubuntu-touch|ubuntu-pd)
-		case $SUBPROJECT in
-			system-image)
-				# keep the kernel for the system-image build
-				;;
-			*)
-				OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
-				KERNEL_FLAVOURS=none
-				BINARY_REMOVE_LINUX=false
-				;;
-		esac
+	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd)
+		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
+		KERNEL_FLAVOURS=none
+		BINARY_REMOVE_LINUX=false
+		;;
 esac
 
 add_chroot_hook update-apt-file-cache