|
 |
c4e3b2 |
From 5f97a7d207dd52af15869726e9a628c3f9f1c5ff Mon Sep 17 00:00:00 2001
|
|
|
c4e3b2 |
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
|
c4e3b2 |
Date: Thu, 1 Jul 2021 20:29:39 +0200
|
|
|
c4e3b2 |
Subject: [PATCH 17/19] OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL
|
|
|
c4e3b2 |
only)
|
|
|
c4e3b2 |
MIME-Version: 1.0
|
|
|
c4e3b2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
c4e3b2 |
Content-Transfer-Encoding: 8bit
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
c4e3b2 |
RH-MergeRequest: 3: Disable features for RHEL9
|
|
|
c4e3b2 |
RH-Commit: [17/19] 491fe1301ea29c7cb56c20272e45614d5fcb6f14
|
|
|
c4e3b2 |
RH-Bugzilla: 1967747
|
|
|
c4e3b2 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
Remove the command to register a file in the shell as the
|
|
|
c4e3b2 |
initial ramdisk for a UEFI stubbed kernel, to be booted next.
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
Note: as further dynamic shell commands might show up upstream,
|
|
|
c4e3b2 |
we intentionally preserve the empty !ifdef'ry context to ease
|
|
|
c4e3b2 |
future downstream rebases.
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
c4e3b2 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
c4e3b2 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
c4e3b2 |
---
|
|
|
c4e3b2 |
OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ----
|
|
|
c4e3b2 |
OvmfPkg/AmdSev/AmdSevX64.fdf | 1 -
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgIa32.dsc | 4 ----
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgX64.dsc | 4 ----
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
|
c4e3b2 |
8 files changed, 20 deletions(-)
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
|
c4e3b2 |
index a54a4e39e2..485c60dd36 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
|
c4e3b2 |
@@ -783,10 +783,6 @@
|
|
|
c4e3b2 |
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf
|
|
|
c4e3b2 |
OvmfPkg/AmdSev/Grub/Grub.inf
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
|
c4e3b2 |
index 89e35c5b19..1cf4d659d1 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
|
c4e3b2 |
@@ -267,7 +267,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
|
|
c4e3b2 |
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf
|
|
|
c4e3b2 |
INF OvmfPkg/AmdSev/Grub/Grub.inf
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
c4e3b2 |
index d22b643161..f844c5f97c 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
c4e3b2 |
@@ -907,10 +907,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
ShellPkg/Application/Shell/Shell.inf {
|
|
|
c4e3b2 |
<LibraryClasses>
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
c4e3b2 |
index 87afeb57a1..f4a6829085 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
c4e3b2 |
@@ -290,7 +290,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
c4e3b2 |
index d3e913d094..b373c0d63a 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
c4e3b2 |
@@ -921,10 +921,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
ShellPkg/Application/Shell/Shell.inf {
|
|
|
c4e3b2 |
<LibraryClasses>
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
c4e3b2 |
index 96e65fab46..35692403d3 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
c4e3b2 |
@@ -291,7 +291,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
c4e3b2 |
index 13320b3aa9..39e8e5b3c4 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
c4e3b2 |
@@ -919,10 +919,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
ShellPkg/Application/Shell/Shell.inf {
|
|
|
c4e3b2 |
<LibraryClasses>
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
c4e3b2 |
index b3dccaebd3..a0c3c182f6 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
c4e3b2 |
@@ -303,7 +303,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
--
|
|
|
c4e3b2 |
2.27.0
|
|
|
c4e3b2 |
|