[fix] : copy UEFI shell from airootfs instead of the host system

Hayao0819 · Hayao0819 · commit 554e21a9d568 · 2020-08-16T08:35:42.000+09:00
diff --git a/build.sh b/build.sh
@@ -1052,7 +1052,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/channels/share/packages.i686/base.i686 b/channels/share/packages.i686/base.i686
@@ -16,3 +16,4 @@ amd-ucode
 mkinitcpio-nfs-utils
 nbd
 
+edk2-shell
diff --git a/channels/share/packages.x86_64/base.x86_64 b/channels/share/packages.x86_64/base.x86_64
@@ -16,3 +16,4 @@ amd-ucode
 mkinitcpio-nfs-utils
 nbd
 
+edk2-shell
diff --git a/default.conf b/default.conf
@@ -197,7 +197,6 @@ dependence=(
     "arch-install-scripts"
     "curl"
     "dosfstools"
-    "edk2-shell"
     "git"
     "libburn"
     "libisofs"
diff --git a/wizard.sh b/wizard.sh
@@ -25,7 +25,6 @@ dependence=(
     "arch-install-scripts"
     "curl"
     "dosfstools"
-    "edk2-shell"
     "git"
     "libburn"
     "libisofs"

Original file line number	Diff line number	Diff line change
`@@ -1052,7 +1052,7 @@ make_efi() {`
`1052`	`1052`
`1053`	`1053`	`# edk2-shell based UEFI shell`
`1054`	`1054`	`# shellx64.efi is picked up automatically when on /`
`1055`		`- cp "/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"`
	`1055`	`+ cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"`
`1056`	`1056`	`}`
`1057`	`1057`
`1058`	`1058`	`# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode`