Import patches-unapplied version 2.314 to ubuntu/wily-proposed

Imported using git-ubuntu import.

Changelog parent: eab885e336

New changelog entries:
  [ Iain Lane ]
  * Small whitespace cleanup in live-build/auto/config
  [ Sebastien Bacher ]
  * Set kernel flavours variable to try to fix amd64 build

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (2.314) wily; urgency=medium
+
+  [ Iain Lane ]
+  * Small whitespace cleanup in live-build/auto/config
+
+  [ Sebastien Bacher ]
+  * Set kernel flavours variable to try to fix amd64 build
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 10 Jun 2015 15:10:03 +0200
+
 livecd-rootfs (2.313) wily; urgency=medium
 
   * Revert symlink changes, that creates build issues, copy updated hook

live-build/auto/config

@@ -207,6 +207,7 @@ case $PROJECT in
 		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
@@ -371,48 +372,48 @@ case $PROJECT in
 		#      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
-                        # no Task: header yet
-                        add_package install ubuntu-snappy
- 
-                        # no minimal as we want to be really minimal
-		        #add_task install minimal
+			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
+			# no Task: header yet
+			add_package install ubuntu-snappy
+
+			# no minimal as we want to be really minimal
+			#add_task install minimal
 			add_task install ubuntu-core
 
-                        # add special azure package
-                        case $ARCH in
-                            amd64)
-                                # will be removed later when the azure
-                                # specific device tarfile is created
-                                add_package install walinuxagent
-                                ;;
-                            i386)
-                                # efi support can go once the task
-                                # header is available for grub-efi-ia32-bin
-                                add_package install grub-efi-ia32-bin
-                                ;;
-                        esac
-
-                        # generic kernel etc
-                        KERNEL_FLAVOURS=generic
-                        case $ARCH in
-			    i386|amd64)	
-			        add_package install grub-pc
-                                ;;
-                            armhf)
-                                add_package install flash-kernel u-boot-tools
-                                ;;
-                        esac
-		        OPTS="${OPTS:+$OPTS }--linux-packages=linux-image"
-
-                        # contains the framework definition
-                        add_package install ubuntu-core-libs
+			# add special azure package
+			case $ARCH in
+				amd64)
+					# will be removed later when the azure
+					# specific device tarfile is created
+					add_package install walinuxagent
+					;;
+				i386)
+					# efi support can go once the task
+					# header is available for grub-efi-ia32-bin
+					add_package install grub-efi-ia32-bin
+					;;
+			esac
+
+			# generic kernel etc
+			KERNEL_FLAVOURS=generic
+			case $ARCH in
+				i386|amd64)
+					add_package install grub-pc
+					;;
+				armhf)
+					add_package install flash-kernel u-boot-tools
+					;;
+			esac
+			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'