* added additional CPC build targets:

- added manifest generation for squashfs and root.tar.gz
  - added VMDK generation
  - added OVA generation from VMDK's
  - added generic Vagrant image generation

debian/changelog

@@ -1,3 +1,26 @@
+livecd-rootfs (2.356) xenial; urgency=medium
+
+  * added additional CPC build targets:
+    - added manifest generation for squashfs and root.tar.gz
+    - added VMDK generation
+    - added OVA generation from VMDK's
+    - added generic Vagrant image generation
+
+ -- Ben Howard <ben.howard@ubuntu.com>  Fri, 13 Nov 2015 08:09:47 -0700
+
+livecd-rootfs (2.355) xenial; urgency=medium
+
+  * fix input group in snappy
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 13 Nov 2015 12:52:34 +0100
+
+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

live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early

@@ -152,6 +152,7 @@ docker:x:113:ubuntu
 syslog:x:114:
 pkcs11:x:115:root
 tss:x:116:
+input:x:107:
 EOF
 else
     echo "/etc/group post-debootstrap hash doesn't match record" >&2
@@ -217,6 +218,7 @@ docker:!::ubuntu
 syslog:!::
 pkcs11:!::root
 tss:!::
+input:!::
 EOF
 else
     echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2

live-build/ubuntu-cpc/hooks/042-vagrant.binary

@@ -18,7 +18,7 @@ my_d=$(dirname $(readlink -f ${0}))
 architecture=$(chroot chroot dpkg --print-architecture)
 base_vmdk="livecd.ubuntu-cpc.disk1.vmdk"
 
-if [[ "${architecture}" =~ (amd64|i386) ]]; then
+if [[ ! "${architecture}" =~ (amd64|i386) ]]; then
 	echo "Vagrant images are not supported for ${architecutre}"
 	exit 0
 elif [ ! -e ${base_vmdk} ]; then