From d52d36363e738d562f6dee90616504ec9541e9cd Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 30 Jul 2020 18:22:44 +0300
Subject: releng: copy UEFI shell from airootfs instead of the host system

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/35 .
---
 README.rst                     | 1 -
 configs/releng/build.sh        | 2 +-
 configs/releng/packages.x86_64 | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index af54aba..b65db6d 100644
--- a/README.rst
+++ b/README.rst
@@ -14,7 +14,6 @@ The following packages need to be installed to be able to create an image with t
 * arch-install-scripts
 * dosfstools
 * e2fsprogs
-* edk2-shell
 * libisoburn
 * squashfs-tools
 
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 7f0eb67..709bd46 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -204,7 +204,7 @@ make_efi() {
 
     # edk2-shell based UEFI shell
     # shellx64.efi is picked up automatically when on /
-    cp /usr/share/edk2-shell/x64/Shell_Full.efi "${work_dir}/iso/shellx64.efi"
+    cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
 }
 
 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index f5e7e9f..47dc64c 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -17,6 +17,7 @@ diffutils
 dmraid
 dnsmasq
 dosfstools
+edk2-shell
 efibootmgr
 ethtool
 exfat-utils
-- 
cgit v1.2.3-70-g09d2