Import patches-unapplied version 2.263 to ubuntu/vivid-proposed

Imported using git-ubuntu import.

Changelog parent: 75fc29334d

New changelog entries:
  * live-build/auto/config:
    - explicitly set KERNEL_FLAVOURS=generic to get the right kernel
      on armhf

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.263) vivid; urgency=medium
+
+  * live-build/auto/config:
+    - explicitly set KERNEL_FLAVOURS=generic to get the right kernel
+      on armhf
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 03 Nov 2014 11:30:02 +0100
+
 livecd-rootfs (2.262) vivid; urgency=medium
 
   * fix typo in 99zz-check-uid-gid.chroot

live-build/auto/config

@@ -353,6 +353,9 @@ case $PROJECT in
 			        add_package install grub-pc ;;
                         esac
 
+                        # generic kernel on amd64/arm for now
+                        KERNEL_FLAVOURS=generic
+
                         # contains the framework definition
                         add_package install ubuntu-core-libs