From c1d277217b6d4115277cac4de26943fde3b7f170 Mon Sep 17 00:00:00 2001

From: Laszlo Ersek <lersek@redhat.com>

Date: Tue, 4 Nov 2014 23:02:53 +0100

Subject: [PATCH] OvmfPkg: allow exclusion of the shell from the firmware image

When '-D EXCLUDE_SHELL_FROM_FD' is passed to 'build', exclude the shell

binary from the firmware image.

Peter Jones advised us that firmware vendors for physical systems disable

the memory-mapped, firmware image-contained UEFI shell in

SecureBoot-enabled builds. The reason being that the memory-mapped shell

can always load, it may have direct access to various hardware in the

system, and it can run UEFI shell scripts (which cannot be signed at all).

Intended use of the new build option:

- In-tree builds: don't pass '-D EXCLUDE_SHELL_FROM_FD'. The resultant

  firmware image will contain a shell binary, independently of SecureBoot

  enablement, which is flexible for interactive development. (Ie. no

  change for in-tree builds.)

- RPM builds: pass both '-D SECURE_BOOT_ENABLE' and

  '-D EXCLUDE_SHELL_FROM_FD'. The resultant RPM will provide:

  - OVMF_CODE.fd: SecureBoot-enabled firmware, without builtin UEFI shell,

  - OVMF_VARS.fd: variable store template matching OVMF_CODE.fd,

  - UefiShell.iso: a bootable ISO image with the shell on it as default

    boot loader. The shell binary will load when SecureBoot is turned off,

    and won't load when SecureBoot is turned on (because it is not

    signed).

    UefiShell.iso is the reason we're not excluding the shell from the DSC

    files as well, only the FDF files -- when '-D EXCLUDE_SHELL_FROM_FD'

    is specified, the shell binary needs to be built the same, only it

    will be included in UefiShell.iso.

Notes about the 20160608b-988715a -> 20170228-c325e41585e3 rebase:

- no changes

Notes about the 20170228-c325e41585e3 -> 20171011-92d07e48907f rebase:

- no changes

Signed-off-by: Laszlo Ersek <lersek@redhat.com>

(cherry picked from commit 9c391def70366cabae08e6008814299c3372fafd)

(cherry picked from commit d9dd9ee42937b2611fe37183cc9ec7f62d946933)

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

---

 OvmfPkg/OvmfPkgIa32.fdf    | 2 ++

 OvmfPkg/OvmfPkgIa32X64.fdf | 3 +++

 OvmfPkg/OvmfPkgX64.fdf     | 3 +++

 3 files changed, 8 insertions(+)

diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf

index 6e1e7f5f44..07c1cdbe81 100644

--- a/OvmfPkg/OvmfPkgIa32.fdf

+++ b/OvmfPkg/OvmfPkgIa32.fdf

@@ -291,11 +291,13 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour

 INF  FatPkg/EnhancedFatDxe/Fat.inf

 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

+!ifndef $(EXCLUDE_SHELL_FROM_FD)

 !if $(TOOL_CHAIN_TAG) != "XCODE5"

 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

 INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

 !endif

 INF  ShellPkg/Application/Shell/Shell.inf

+!endif

 !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)

 INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf

diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf

index 1fab3d5014..b1560d6218 100644

--- a/OvmfPkg/OvmfPkgIa32X64.fdf

+++ b/OvmfPkg/OvmfPkgIa32X64.fdf

@@ -292,11 +292,14 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour

 INF  FatPkg/EnhancedFatDxe/Fat.inf

 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

+!ifndef $(EXCLUDE_SHELL_FROM_FD)

 !if $(TOOL_CHAIN_TAG) != "XCODE5"

 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

 INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

 !endif

 INF  ShellPkg/Application/Shell/Shell.inf

+!endif

+

 !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)

 INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf

diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf

index 6dc48977a0..34cd97aac4 100644

--- a/OvmfPkg/OvmfPkgX64.fdf

+++ b/OvmfPkg/OvmfPkgX64.fdf

@@ -301,11 +301,14 @@ INF  MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour

 INF  FatPkg/EnhancedFatDxe/Fat.inf

 INF  MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf

+!ifndef $(EXCLUDE_SHELL_FROM_FD)

 !if $(TOOL_CHAIN_TAG) != "XCODE5"

 INF  ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf

 INF  OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf

 !endif

 INF  ShellPkg/Application/Shell/Shell.inf

+!endif

+

 !if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) || ($(TLS_ENABLE) == TRUE)

 INF MdeModulePkg/Logo/LogoOpenSSLDxe.inf