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

Imported using git-ubuntu import.

Changelog parent: 1a48fd620db5944272ff017b09092ad620baa728

New changelog entries:
  * lp:~mvo/livecd-rootfs/snappy-add-fw_env.config:
    - add /etc/fw_env.config that points to
      /boot/uboot/fw_env.config to make fw_{set,print}env work

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.333) wily; urgency=medium
+
+  * lp:~mvo/livecd-rootfs/snappy-add-fw_env.config:
+    - add /etc/fw_env.config that points to
+      /boot/uboot/fw_env.config to make fw_{set,print}env work
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 17 Jul 2015 17:46:09 +0200
+
 livecd-rootfs (2.332) wily; urgency=medium
 
   * Get previous ubuntu-core changes on desktop-next

live-build/ubuntu-core/hooks/16-ensure-uboot.chroot

@@ -4,4 +4,15 @@ set -e
 
 if [ "$(dpkg --print-architecture)" = "armhf" ]; then
     mkdir -p /boot/uboot
+    cat > /etc/fw_env.config <<EOF
+# snappy u-boot env config
+# its crucial that we have the two entries here
+#   u-boot/tools/env/fw_env.c 
+# will read only 4 header bytes if its a single
+# line but our header has 5 byte. by having two
+# entries like this in the config it magically
+# switches to the 5 byte header type
+/boot/uboot/uboot.env 0x0000 0x20000
+/boot/uboot/uboot.env 0x0000 0x20000
+EOF
 fi