|
 |
795857 |
From ed81dfa142253a7c37824201cf525231b7efcb71 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
|
|
|
75d8e7 |
Subject: OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL 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
|
|
|
795857 |
index b3fa4941c5..adb051ecea 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
|
795857 |
@@ -721,10 +721,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
|
|
|
795857 |
index 1b743cc93f..1d55c7815f 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
|
75d8e7 |
@@ -274,7 +274,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
|
|
|
795857 |
index 43d60df6e3..3b86666695 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
795857 |
@@ -909,10 +909,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
795857 |
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
!endif
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
ShellPkg/Application/Shell/Shell.inf {
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
795857 |
index 5b7c3f7687..b1f4dbacd7 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
795857 |
@@ -296,7 +296,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
|
|
795857 |
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
795857 |
index 56426672b8..c384425723 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
795857 |
@@ -923,10 +923,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
795857 |
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
!endif
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
ShellPkg/Application/Shell/Shell.inf {
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
795857 |
index 45f5b69171..c3dcda85c5 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
795857 |
@@ -297,7 +297,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
|
|
795857 |
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
795857 |
index 2b4635a71b..bf372014b9 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
795857 |
@@ -991,10 +991,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
795857 |
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
!endif
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
ShellPkg/Application/Shell/Shell.inf {
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
795857 |
index 6b20e0946f..2fd1d5315a 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
795857 |
@@ -322,7 +322,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
|
|
795857 |
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
795857 |
!if $(BUILD_SHELL) == TRUE
|
|
|
c4e3b2 |
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
c4e3b2 |
--
|
|
|
795857 |
2.38.1
|
|
|
c4e3b2 |
|