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

Imported using git-ubuntu import.

Changelog parent: 3242ef6c59

New changelog entries:
  * do not ship assets/dtbs/overlays in raspi2 tarball, it breaks
    ubuntu-device-flash

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.354) xenial; urgency=medium
+
+  * do not ship assets/dtbs/overlays in raspi2 tarball, it breaks
+    ubuntu-device-flash
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 13 Nov 2015 10:53:13 +0100
+
 livecd-rootfs (2.353) xenial; urgency=medium
 
   * drop input group from snappy images, adjust md5 sums in

live-build/auto/build

@@ -425,6 +425,15 @@ case $PROJECT:$SUBPROJECT in
         dtbs=$(find lib/firmware -type d -name 'device-tree' -print0)
         if [ -n "$dtbs" ]; then
            mv "$dtbs" $TMPDIR/assets/dtbs
+           case $devarch in
+               raspi2)
+                   # ubuntu-device-flash does not like subdirs here, we need to tar it up
+                   if [ -e $TMPDIR/assets/dtbs/overlays ]; then
+                       tar -C $TMPDIR/assets/dtbs -f $TMPDIR/assets/dtbs/overlays.tgz -czv overlays
+                       rm -rf $TMPDIR/assets/dtbs/overlays
+                   fi
+                   ;;
+           esac
         fi
 
         # create hardware.yaml