From 63679ebbe1aa74701895d97c629fd64f0d765e6c Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 19 Nov 2015 15:08:00 -0800
Subject: [PATCH 1/2] setup_board: Set grub use flags to build arm64

Set the host grub use flags to build arm64 grub support when BOARD is
equal to arm64-usr.

From: Andrej Rosano <andrej@inversepath.com>
[Move to case statement]
Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 setup_board | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/setup_board b/setup_board
index bec513bf97..755c6b3b63 100755
--- a/setup_board
+++ b/setup_board
@@ -163,6 +163,13 @@ case "$BOARD" in
   *-host)
     die_notrace "host boards not supported by setup_board"
     ;;
+  arm64-usr)
+    # Set grub use flags to build arm64.
+    [[ ! -d /etc/portage/package.use ]] && sudo mkdir /etc/portage/package.use
+    sudo_clobber "/etc/portage/package.use/grub" <<EOF
+sys-boot/grub grub_platforms_arm64
+EOF
+    ;;
 esac
 # Locations we will need
 COREOS_OVERLAY="${REPO_ROOT}/src/third_party/coreos-overlay"

From 57c129acfdd3a19fe51dabb7807667eed6177fd1 Mon Sep 17 00:00:00 2001
From: Geoff Levand <geoff@infradead.org>
Date: Thu, 19 Nov 2015 15:08:00 -0800
Subject: [PATCH 2/2] setup_board: Call setup_qemu_static

setup_qemu_static only needs to be called once, and can
be done early so that it is available.  Move the call
of setup_qemu_static from build_packages to setup_board.

Signed-off-by: Geoff Levand <geoff@infradead.org>
---
 build_packages | 2 --
 setup_board    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build_packages b/build_packages
index 6579c58154..23722d68dd 100755
--- a/build_packages
+++ b/build_packages
@@ -222,8 +222,6 @@ break_dep_loop sys-apps/util-linux udev,systemd sys-apps/systemd cryptsetup
 break_dep_loop sys-apps/systemd cryptsetup
 
 info "Merging board packages now"
-# The following line is required by chroots present in "update-bootengine"
-setup_qemu_static "${BOARD_ROOT}"
 sudo -E "${EMERGE_CMD[@]}" "${EMERGE_FLAGS[@]}" \
     @system coreos-devel/board-packages
 
diff --git a/setup_board b/setup_board
index 755c6b3b63..725901954f 100755
--- a/setup_board
+++ b/setup_board
@@ -317,3 +317,6 @@ if [ -n "${WORKING_ON}" ]; then
   info "Currently working on the following ebuilds for this board:"
   info "${WORKING_ON}"
 fi
+
+# Setup BOARD_ROOT for QEMU user emulation.
+setup_qemu_static "${BOARD_ROOT}"