From 2ce375cd011ef9f124cfc8b19c1ceb30aba4f413 Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 23 May 2020 13:32:28 +0200 Subject: Using edk2-shell for UEFI shell configs/releng/build.sh: Instead of downloading UDK2018 based edk2 UEFI shell, use the Shell binaries from the edk2-shell package. This effectively makes the use of EFI shell v1 obsolete. configs/releng/efiboot/loader/entries/uefi-shell-v*: Renaming UEFI shell entries to match the packaged edk2-shell based UEFI shell binaries. configs/releng/build.sh: Renaming the systemd-boot bootloader entries for UEFI shell (normal and full version) to reflect their file names, which are derived from the binary names in the edk2-shell package. Copying the edk2-shell based UEFI shell binaries for normal efiboot and .iso based "el-torito" efiboot mode. docs/README.build: Adding edk2-shell to the requirements in the documentation, as the package is now used to provide UEFI shell. --- configs/releng/build.sh | 19 +++++++++---------- .../loader/entries/uefi-shell-full-x86_64.conf | 2 ++ .../efiboot/loader/entries/uefi-shell-v1-x86_64.conf | 2 -- .../efiboot/loader/entries/uefi-shell-v2-x86_64.conf | 2 -- .../efiboot/loader/entries/uefi-shell-x86_64.conf | 2 ++ 5 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-full-x86_64.conf delete mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf delete mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf create mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf (limited to 'configs/releng') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 659e8de..dc39926 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -160,17 +160,16 @@ make_efi() { mkdir -p ${work_dir}/iso/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/iso/loader/ - cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/ - cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/ + cp ${script_path}/efiboot/loader/entries/uefi-shell-x86_64.conf ${work_dir}/iso/loader/entries/ + cp ${script_path}/efiboot/loader/entries/uefi-shell-full-x86_64.conf ${work_dir}/iso/loader/entries/ sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf - # EFI Shell 2.0 for UEFI 2.3+ - curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://raw.githubusercontent.com/tianocore/edk2/UDK2018/ShellBinPkg/UefiShell/X64/Shell.efi - # EFI Shell 1.0 for non UEFI 2.3+ - curl -o ${work_dir}/iso/EFI/shellx64_v1.efi https://raw.githubusercontent.com/tianocore/edk2/UDK2018/EdkShellBinPkg/FullShell/X64/Shell_Full.efi + # edk2-shell based UEFI shell + cp /usr/share/edk2-shell/x64/Shell.efi ${work_dir}/iso/EFI/Shell_x64.efi + cp /usr/share/edk2-shell/x64/Shell_Full.efi ${work_dir}/iso/EFI/Shell_Full_x64.efi } # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode @@ -197,15 +196,15 @@ make_efiboot() { mkdir -p ${work_dir}/efiboot/loader/entries cp ${script_path}/efiboot/loader/loader.conf ${work_dir}/efiboot/loader/ - cp ${script_path}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/loader/entries/ - cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/ + cp ${script_path}/efiboot/loader/entries/uefi-shell-x86_64.conf ${work_dir}/efiboot/loader/entries/ + cp ${script_path}/efiboot/loader/entries/uefi-shell-full-x86_64.conf ${work_dir}/efiboot/loader/entries/ sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf - cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/ - cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/ + cp ${work_dir}/iso/EFI/Shell_x64.efi ${work_dir}/efiboot/EFI/ + cp ${work_dir}/iso/EFI/Shell_Full_x64.efi ${work_dir}/efiboot/EFI/ umount -d ${work_dir}/efiboot } diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-full-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-full-x86_64.conf new file mode 100644 index 0000000..054fa52 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/uefi-shell-full-x86_64.conf @@ -0,0 +1,2 @@ +title UEFI Shell (Full) x86_64 +efi /EFI/Shell_Full_x64.efi diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf deleted file mode 100644 index 9597ff2..0000000 --- a/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf +++ /dev/null @@ -1,2 +0,0 @@ -title UEFI Shell x86_64 v1 -efi /EFI/shellx64_v1.efi diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf deleted file mode 100644 index 0dde77a..0000000 --- a/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf +++ /dev/null @@ -1,2 +0,0 @@ -title UEFI Shell x86_64 v2 -efi /EFI/shellx64_v2.efi diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf new file mode 100644 index 0000000..b5dfbf2 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/uefi-shell-x86_64.conf @@ -0,0 +1,2 @@ +title UEFI Shell x86_64 +efi /EFI/Shell_x64.efi -- cgit v1.2.3-70-g09d2