From c9470d78b1f5a1d37001234373d905f5c627c264 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Thu, 10 Dec 2015 15:04:41 +0100
Subject: [PATCH] Import patches-unapplied version 2.363 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 9d5b29127d91fd34153ccb9961abd7de536f1f9a

New changelog entries:
  * configure /etc/fw_env.config for all arm arches on snappy
---
 debian/changelog                                    |  6 ++++++
 live-build/ubuntu-core/hooks/16-ensure-uboot.chroot | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b182678f..0853cbf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.363) xenial; urgency=medium
+
+  * configure /etc/fw_env.config for all arm arches on snappy
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 10 Dec 2015 15:04:41 +0100
+
 livecd-rootfs (2.362) xenial; urgency=medium
 
   * make sure u-boot-tools is installed on snappy arm64
diff --git a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
index 655da6f3..4a9a5c91 100644
--- a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
+++ b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
@@ -2,9 +2,10 @@
 
 set -e
 
-if [ "$(dpkg --print-architecture)" = "armhf" ]; then
-    mkdir -p /boot/uboot
-    cat > /etc/fw_env.config <<EOF
+case "$(dpkg --print-architecture)" in
+    arm*)
+        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 
@@ -15,4 +16,5 @@ if [ "$(dpkg --print-architecture)" = "armhf" ]; then
 /boot/uboot/uboot.env 0x0000 0x20000
 /boot/uboot/uboot.env 0x0000 0x20000
 EOF
-fi
+        ;;
+esac