147 lines
5.1 KiB
Diff
147 lines
5.1 KiB
Diff
|
From 855afbe9bf9ebb68f9cdb3ace57ce99e5614375f Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
||
|
|
Date: Thu, 1 Jul 2021 20:29:39 +0200
|
||
|
|
Subject: OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only)
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
RH-MergeRequest: 3: Disable features for RHEL9
|
||
|
|
RH-Commit: [17/19] 491fe1301ea29c7cb56c20272e45614d5fcb6f14
|
||
|
|
RH-Bugzilla: 1967747
|
||
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
|
||
|
|
Remove the command to register a file in the shell as the
|
||
|
|
initial ramdisk for a UEFI stubbed kernel, to be booted next.
|
||
|
|
|
||
|
|
Note: as further dynamic shell commands might show up upstream,
|
||
|
|
we intentionally preserve the empty !ifdef'ry context to ease
|
||
|
|
future downstream rebases.
|
||
|
|
|
||
|
|
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
||
|
|
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ----
|
||
|
|
OvmfPkg/AmdSev/AmdSevX64.fdf | 1 -
|
||
|
|
OvmfPkg/OvmfPkgIa32.dsc | 4 ----
|
||
|
|
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
||
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
|
||
|
|
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
||
|
|
OvmfPkg/OvmfPkgX64.dsc | 4 ----
|
||
|
|
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
||
|
|
8 files changed, 20 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
index 35691989bd..88b65b9f59 100644
|
||
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
@@ -785,10 +785,6 @@
|
||
|
|
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||
|
|
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
||
|
|
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
||
|
|
- <PcdsFixedAtBuild>
|
||
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
- }
|
||
|
|
!endif
|
||
|
|
OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf
|
||
|
|
OvmfPkg/AmdSev/Grub/Grub.inf
|
||
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||
|
|
index 52cb301d43..325570c5a3 100644
|
||
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||
|
|
@@ -274,7 +274,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
||
|
|
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
||
|
|
!endif
|
||
|
|
INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf
|
||
|
|
INF OvmfPkg/AmdSev/Grub/Grub.inf
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
index 1a14d8125b..fa42d919be 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
@@ -910,10 +910,6 @@
|
||
|
|
!endif
|
||
|
|
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
||
|
|
- <PcdsFixedAtBuild>
|
||
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
- }
|
||
|
|
!endif
|
||
|
|
ShellPkg/Application/Shell/Shell.inf {
|
||
|
|
<LibraryClasses>
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
index bdb8bd2388..51433836d6 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
@@ -287,7 +287,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
||
|
|
!endif
|
||
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
||
|
|
!endif
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
index a528e35e99..ef962565f8 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
@@ -924,10 +924,6 @@
|
||
|
|
!endif
|
||
|
|
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
||
|
|
- <PcdsFixedAtBuild>
|
||
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
- }
|
||
|
|
!endif
|
||
|
|
ShellPkg/Application/Shell/Shell.inf {
|
||
|
|
<LibraryClasses>
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
index 2bb9c91909..a50f80e1e9 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
@@ -291,7 +291,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
||
|
|
!endif
|
||
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
||
|
|
!endif
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
index 8b4963b022..ba9f9833b0 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
@@ -922,10 +922,6 @@
|
||
|
|
!endif
|
||
|
|
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
||
|
|
- <PcdsFixedAtBuild>
|
||
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
- }
|
||
|
|
!endif
|
||
|
|
ShellPkg/Application/Shell/Shell.inf {
|
||
|
|
<LibraryClasses>
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
index 9d1dfb1cee..dd1c6eded9 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
@@ -307,7 +307,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
||
|
|
!endif
|
||
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
||
|
|
!endif
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|