148 lines
5.7 KiB
Diff
148 lines
5.7 KiB
Diff
|
From 1025e8342c42c49d9b3bbffd6a923b4cb89ec76a 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: [PATCH] OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only)
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
Rebase to edk2-stable202311:
|
||
|
|
|
||
|
|
Minor update, context change due to new variable policy shell command.
|
||
|
|
|
||
|
|
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 75bec7859e..753957bcc4 100644
|
||
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
||
|
|
@@ -737,10 +737,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 5d0cba1e13..9b65ebac56 100644
|
||
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
||
|
|
@@ -276,7 +276,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 44139c648c..2825acec3e 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
@@ -885,10 +885,6 @@
|
||
|
|
<PcdsFixedAtBuild>
|
||
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
}
|
||
|
|
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
||
|
|
- <PcdsFixedAtBuild>
|
||
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
- }
|
||
|
|
!endif
|
||
|
|
!if $(BUILD_SHELL) == TRUE
|
||
|
|
ShellPkg/Application/Shell/Shell.inf {
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
index 56520eaf99..de73cabb6e 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
||
|
|
!endif
|
||
|
|
!if $(BUILD_SHELL) == TRUE
|
||
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
index e2f13499cc..f1af88a9b5 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
@@ -899,10 +899,6 @@
|
||
|
|
<PcdsFixedAtBuild>
|
||
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
}
|
||
|
|
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
||
|
|
- <PcdsFixedAtBuild>
|
||
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
- }
|
||
|
|
!endif
|
||
|
|
!if $(BUILD_SHELL) == TRUE
|
||
|
|
ShellPkg/Application/Shell/Shell.inf {
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
index f04620418b..241019cb28 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
||
|
|
!endif
|
||
|
|
!if $(BUILD_SHELL) == TRUE
|
||
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
index f1dc48c3be..908895354b 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
@@ -967,10 +967,6 @@
|
||
|
|
<PcdsFixedAtBuild>
|
||
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
}
|
||
|
|
- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
||
|
|
- <PcdsFixedAtBuild>
|
||
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
||
|
|
- }
|
||
|
|
!endif
|
||
|
|
!if $(BUILD_SHELL) == TRUE
|
||
|
|
ShellPkg/Application/Shell/Shell.inf {
|
||
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
index 61a3c63166..c1e7240076 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
@@ -317,7 +317,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
||
|
|
!endif
|
||
|
|
!if $(BUILD_SHELL) == TRUE
|
||
|
|
INF ShellPkg/Application/Shell/Shell.inf
|