From 56e798bcbd1fba13de4f16b355db9cbf58fd62a9 Mon Sep 17 00:00:00 2001
From: Oliver Grawert <ogra@ubuntu.com>
Date: Fri, 13 May 2016 21:06:41 +0200
Subject: [PATCH] add u-boot-tools to all snappy arches, drop flash-kernel from
 snappy, create /boot/uboot dir on all snappy arches and configure
 /etc/fw_env.config

---
 debian/changelog                                    | 9 ++++++++-
 live-build/auto/config                              | 8 ++------
 live-build/ubuntu-core/hooks/16-ensure-uboot.chroot | 8 ++------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b73bf3c..218a340f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 livecd-rootfs (2.411) UNRELEASED; urgency=medium
 
+  [ Michael Vogt ]
   * update kernel snap building to match the new kernel policy
   * system-image: add /usr/local/bin/xdg-open dbus helper
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 10 May 2016 18:16:56 -0700
+  [ Oliver Grawert ]
+  * add u-boot-tools to all snappy arches
+  * drop flash-kernel from snappy, it is useless there
+  * create /boot/uboot dir on all arches and configure /etc/fw_env.config
+    everywhere
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Fri, 13 May 2016 21:01:34 +0200
 
 livecd-rootfs (2.410) yakkety; urgency=medium
 
diff --git a/live-build/auto/config b/live-build/auto/config
index 0621058b..336e5186 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -362,6 +362,8 @@ case $PROJECT in
 		# no Task: header yet
 		add_package install snapd
 		add_package install ubuntu-core-snapd-units
+                # we want all arches to have u-boot-tools
+                add_package install u-boot-tools
 
 		# no minimal as we want to be really minimal
 		#add_task install minimal
@@ -390,12 +392,6 @@ case $PROJECT in
 				add_package install grub-efi-amd64-signed
 				add_package install shim-signed
 				;;
-			armhf)
-				add_package install flash-kernel u-boot-tools
-				;;
-			arm64)
-				add_package install u-boot-tools
-                                ;;
 		esac
 		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
 
diff --git a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
index 4a9a5c91..5a3b3ef7 100644
--- a/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
+++ b/live-build/ubuntu-core/hooks/16-ensure-uboot.chroot
@@ -2,10 +2,8 @@
 
 set -e
 
-case "$(dpkg --print-architecture)" in
-    arm*)
-        mkdir -p /boot/uboot
-        cat > /etc/fw_env.config <<EOF
+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 
@@ -16,5 +14,3 @@ case "$(dpkg --print-architecture)" in
 /boot/uboot/uboot.env 0x0000 0x20000
 /boot/uboot/uboot.env 0x0000 0x20000
 EOF
-        ;;
-esac