2024-05-15 07:15:17 +00:00
|
|
|
From 873a03ce289c988d822f1bb420c1e9a0eef5ca56 Mon Sep 17 00:00:00 2001
|
2022-05-17 08:46:22 +00:00
|
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
|
|
Date: Thu, 1 Jul 2021 20:29:31 +0200
|
2024-05-15 07:15:17 +00:00
|
|
|
Subject: [PATCH] OvmfPkg: Remove HttpDynamicCommand from shell (RHEL only)
|
2022-05-17 08:46:22 +00:00
|
|
|
MIME-Version: 1.0
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
2024-05-15 07:15:17 +00:00
|
|
|
Rebase to edk2-stable202311:
|
|
|
|
|
|
|
|
Minor update, context change due to new variable policy shell command.
|
|
|
|
|
2022-05-17 08:46:22 +00:00
|
|
|
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
|
RH-MergeRequest: 3: Disable features for RHEL9
|
|
|
|
RH-Commit: [15/19] 1911cf04f27467ef1175b1976864c1111d93d19e
|
|
|
|
RH-Bugzilla: 1967747
|
|
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
|
|
|
|
Remove the command to download files in the shell via HTTP(S).
|
|
|
|
|
|
|
|
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/OvmfPkgIa32.dsc | 4 ----
|
|
|
|
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
|
|
|
|
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
|
|
OvmfPkg/OvmfPkgX64.dsc | 4 ----
|
|
|
|
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
|
|
6 files changed, 15 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
index 0183511722..970ffbad82 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
@@ -913,10 +913,6 @@
|
2022-05-17 08:46:22 +00:00
|
|
|
!endif
|
|
|
|
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
2022-05-17 08:46:22 +00:00
|
|
|
- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
- }
|
2024-05-15 07:15:17 +00:00
|
|
|
ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf {
|
2022-05-17 08:46:22 +00:00
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
2024-05-15 07:15:17 +00:00
|
|
|
index cb95c842fa..891e0e06ef 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
2023-11-08 12:25:58 +00:00
|
|
|
@@ -297,7 +297,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
2023-05-09 05:17:15 +00:00
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
2022-05-17 08:46:22 +00:00
|
|
|
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
2022-05-17 08:46:22 +00:00
|
|
|
-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
!endif
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
index 66554b42ed..3127e3d18d 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
@@ -931,10 +931,6 @@
|
2022-05-17 08:46:22 +00:00
|
|
|
!endif
|
|
|
|
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
2022-05-17 08:46:22 +00:00
|
|
|
- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
- }
|
2024-05-15 07:15:17 +00:00
|
|
|
ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf {
|
2022-05-17 08:46:22 +00:00
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2024-05-15 07:15:17 +00:00
|
|
|
index 592f0fed82..61a827b365 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2023-11-08 12:25:58 +00:00
|
|
|
@@ -298,7 +298,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
2023-05-09 05:17:15 +00:00
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
2022-05-17 08:46:22 +00:00
|
|
|
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
2022-05-17 08:46:22 +00:00
|
|
|
-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
!endif
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE
|
2022-05-17 08:46:22 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
index 6d1d2bd39b..6f078b5b27 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
2024-05-15 07:15:17 +00:00
|
|
|
@@ -999,10 +999,6 @@
|
2022-05-17 08:46:22 +00:00
|
|
|
!endif
|
|
|
|
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
2022-05-17 08:46:22 +00:00
|
|
|
- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
- }
|
2024-05-15 07:15:17 +00:00
|
|
|
ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf {
|
2022-05-17 08:46:22 +00:00
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
2024-05-15 07:15:17 +00:00
|
|
|
index 70556f8ace..d2e1c2894f 100644
|
2022-05-17 08:46:22 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
2023-11-08 12:25:58 +00:00
|
|
|
@@ -323,7 +323,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
2023-05-09 05:17:15 +00:00
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
2022-05-17 08:46:22 +00:00
|
|
|
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
2022-05-17 08:46:22 +00:00
|
|
|
-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
!endif
|
2023-05-09 05:17:15 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE
|