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.

4 files changed, 4 insertions, 4 deletions

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