Import patches-unapplied version 2.230 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 157b5a339e

New changelog entries:
  * lp:~mvo/livecd-rootfs/ubuntu-core-system-image:
    - install the "ubuntu-core" task and a kernel when building 
      ubuntu-core with SUBPROJECT=system-image

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.230) utopic; urgency=low
+
+  * lp:~mvo/livecd-rootfs/ubuntu-core-system-image:
+    - install the "ubuntu-core" task and a kernel when building 
+      ubuntu-core with SUBPROJECT=system-image
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 28 Jul 2014 20:10:56 +0200
+
 livecd-rootfs (2.229) utopic; urgency=medium
 
   [ Michael Terry ]

live-build/auto/config

@@ -324,6 +324,13 @@ case $PROJECT in
 
 	ubuntu-core)
 		add_task install minimal
+                # 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
+                fi
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;
 
@@ -429,10 +436,16 @@ esac
 
 case $PROJECT in
 	ubuntu-server|ubuntu-core|ubuntu-touch)
-		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
-		KERNEL_FLAVOURS=none
-		BINARY_REMOVE_LINUX=false
-		;;
+	        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
 esac
 
 add_chroot_hook update-apt-file-cache