From 1fd668ef0d0a5db0017c9d10184da0ed54cd2d97 Mon Sep 17 00:00:00 2001
From: Nick Owens <mischief@coreos.com>
Date: Thu, 12 May 2016 12:05:11 -0700
Subject: [PATCH] build_library: fix grub loader copy for arm64

---
 build_library/vm_image_util.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 77c2d536c9..770176758b 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -558,7 +558,14 @@ _write_cpio_disk() {
     _write_cpio_common $@
     # Pull the kernel and loader out of the filesystem
     cp "${base_dir}"/boot/coreos/vmlinuz-a "${dst_dir}/${vmlinuz_name}"
-    cp "${base_dir}"/boot/coreos/grub/x86_64-efi/core.efi "${dst_dir}/${grub_name}"
+
+    local grub_arch
+    case $BOARD in
+        amd64-usr) grub_arch="x86_64-efi" ;;
+        arm64-usr) grub_arch="arm64-efi" ;;
+    esac
+
+    cp "${base_dir}/boot/coreos/grub/${grub_arch}/core.efi" "${dst_dir}/${grub_name}"
     VM_GENERATED_FILES+=( "${dst_dir}/${vmlinuz_name}" "${dst_dir}/${grub_name}" )
 }