From b3b321ea921ccd4aa866ec042b82f089a0d56a0f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 16 Jul 2015 12:33:47 +0200
Subject: [PATCH 1/3] create fw_env.conf on armhf so that fw_{set,print}env
 works

---
 live-build/ubuntu-core/hooks/16-ensure-uboot.chroot | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
index d52ed276..17e7455f 100644
--- a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
+++ b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
@@ -4,4 +4,8 @@ set -e
 
 if [ "$(dpkg --print-architecture)" = "armhf" ]; then
     mkdir -p /boot/uboot
+    cat > /etc/fw_env.conf <<EOF
+# snappy u-boot env config
+/boot/uboot/uboot.env 0x0000 0x4000
+EOF
 fi

From 4d2b68630d71a41ead185900ede8f792f032ef62 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 16 Jul 2015 15:22:20 +0200
Subject: [PATCH 2/3] its /etc/fw_env.config

---
 live-build/ubuntu-core/hooks/16-ensure-uboot.chroot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
index 17e7455f..72b7e2f4 100644
--- a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
+++ b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
@@ -4,7 +4,7 @@ set -e
 
 if [ "$(dpkg --print-architecture)" = "armhf" ]; then
     mkdir -p /boot/uboot
-    cat > /etc/fw_env.conf <<EOF
+    cat > /etc/fw_env.config <<EOF
 # snappy u-boot env config
 /boot/uboot/uboot.env 0x0000 0x4000
 EOF

From 133addd59014eac6af834e000ea0415eab29405f Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 16 Jul 2015 15:58:16 +0200
Subject: [PATCH 3/3] live-build/ubuntu-core/hooks/16-ensure-uboot.chroot: we
 need to go into redundEnv mode to get the 5byte header that uboot uses by
 default, don't ask why

---
 live-build/ubuntu-core/hooks/16-ensure-uboot.chroot | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
index 72b7e2f4..655da6f3 100644
--- a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
+++ b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
@@ -6,6 +6,13 @@ if [ "$(dpkg --print-architecture)" = "armhf" ]; then
     mkdir -p /boot/uboot
     cat > /etc/fw_env.config <<EOF
 # snappy u-boot env config
-/boot/uboot/uboot.env 0x0000 0x4000
+# 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