Import patches-unapplied version 2.410 to ubuntu/yakkety-proposed

Imported using git-ubuntu import.

Changelog parent: ad693abb51

New changelog entries:
  * 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.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.410) yakkety; 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 16:32:58 -0700
+
 livecd-rootfs (2.409) yakkety; urgency=medium
 
   [ Michael Vogt ]

live-build/auto/config

@@ -168,7 +168,7 @@ if [ "$PREINSTALLED" = "true" ] && [ "$SUBPROJECT" != "wubi" ]; then
 		ubuntu-server)
 			add_package live oem-config-debconf ubiquity-frontend-debconf
 			;;
-		ubuntu-core|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next)
+		ubuntu-core|ubuntu-base|base|ubuntu-touch|ubuntu-pd|ubuntu-cpc|ubuntu-desktop-next)
 			;;
 		*)
 			add_package live oem-config-gtk ubiquity-frontend-gtk
@@ -350,66 +350,64 @@ case $PROJECT in
 		;;
 
 	ubuntu-core)
-		# mvo: This is for cron.daily-preinstalled
+		OPTS="${OPTS:+$OPTS }--apt-recommends false"
-		#      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)
 
-			case $ARCH in
+		# some workarounds because the seeds are not quite
-				i386)
+		# corrent at the moment
-					# efi support can go once the task
+		add_package install dbus
-					# header is available for grub-efi-ia32-bin
+		add_package install isc-dhcp-client
-					add_package install grub-efi-ia32-bin
+		add_package install libpam-systemd
-					;;
+		add_package install ppp
-			esac
+		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
+		case $ARCH in
-			KERNEL_FLAVOURS=none
+			i386)
-			case $ARCH in
+				# efi support can go once the task
-				i386)
+				# header is available for grub-efi-ia32-bin
-					add_package install grub-pc
+				add_package install grub-efi-ia32-bin
-					;;
+				;;
-				amd64)
+		esac
-					add_package install grub-pc-bin
+
-					add_package install grub-efi-amd64-signed
+		# generic kernel etc
-					add_package install shim-signed
+		KERNEL_FLAVOURS=none
-					;;
+		case $ARCH in
-				armhf)
+			i386)
-					add_package install flash-kernel u-boot-tools
+				add_package install grub-pc
-					;;
+				;;
-				arm64)
+			amd64)
-					add_package install u-boot-tools
+				add_package install grub-pc-bin
-                                        ;;
+				add_package install grub-efi-amd64-signed
-			esac
+				add_package install shim-signed
-			OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
+				;;
+			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"
 
-			# contains the framework definition
+		# contains the framework definition
-			add_package install ubuntu-core-libs
+		add_package install ubuntu-core-libs
 
-			# universe needed for 'system-image-cli' and multiverse for firmware
+		# universe needed for 'system-image-cli' and multiverse for firmware
-			COMPONENTS='main restricted universe multiverse'
+		COMPONENTS='main restricted universe multiverse'
-		fi
+		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
+		;;
+
+	ubuntu-base)
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
@@ -557,17 +555,11 @@ case $ARCH in
 esac
 
 case $PROJECT in
-	ubuntu-server|ubuntu-core|ubuntu-touch|ubuntu-pd)
+	ubuntu-server|ubuntu-base|ubuntu-touch|ubuntu-pd)
-		case $SUBPROJECT in
+		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
-			system-image)
+		KERNEL_FLAVOURS=none
-				# keep the kernel for the system-image build
+		BINARY_REMOVE_LINUX=false
-				;;
+		;;
-			*)
-				OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
-				KERNEL_FLAVOURS=none
-				BINARY_REMOVE_LINUX=false
-				;;
-		esac
 esac
 
 add_chroot_hook update-apt-file-cache