Import patches-unapplied version 2.407 to ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: a8b139028e

New changelog entries:
  [ Colin Watson ]
  * Add a basic build-time syntax check for live-build/auto/*.
  [ Oliver Grawert ]
  * add multiverse to sources.list for snappy kernel builds

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (2.407) xenial; urgency=medium
+
+  [ Colin Watson ]
+  * Add a basic build-time syntax check for live-build/auto/*.
+
+  [ Oliver Grawert ]
+  * add multiverse to sources.list for snappy kernel builds
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 21 Apr 2016 10:53:12 +0200
+
 livecd-rootfs (2.406) xenial; urgency=medium
 
   * Fix syntax error.

debian/rules

@@ -4,6 +4,12 @@
 
 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+override_dh_auto_test:
+	dh_auto_test
+	set -e; for x in live-build/auto/*; do \
+		sh -n "$$x"; \
+	done
+
 override_dh_install:
 	dh_install
 	find debian/livecd-rootfs -type f -print0 | \

live-build/auto/config

@@ -407,8 +407,8 @@ case $PROJECT in
 			# contains the framework definition
 			add_package install ubuntu-core-libs
 
-			# universe needed for 'system-image-cli'
-			COMPONENTS='main restricted universe'
+			# universe needed for 'system-image-cli' and multiverse for firmware
+			COMPONENTS='main restricted universe multiverse'
 		fi
 		OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
 		;;