2022-03-31 05:48:14 +00:00
|
|
|
From 58473c715a0091df93972e117f8adddb8d527f63 Mon Sep 17 00:00:00 2001
|
2021-07-12 06:07:40 +00:00
|
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
|
|
|
Date: Thu, 1 Jul 2021 20:29:31 +0200
|
2022-02-01 12:58:25 +00:00
|
|
|
Subject: OvmfPkg: Remove HttpDynamicCommand from shell (RHEL only)
|
2021-07-12 06:07:40 +00:00
|
|
|
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: [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
|
2022-03-31 05:48:14 +00:00
|
|
|
index cc37177297..18349c4652 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
2022-03-31 05:48:14 +00:00
|
|
|
@@ -881,10 +881,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
!endif
|
|
|
|
|
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
- }
|
|
|
|
|
OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
2022-03-31 05:48:14 +00:00
|
|
|
index 22079c83cc..89f91bd08e 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
2022-03-31 05:48:14 +00:00
|
|
|
@@ -282,7 +282,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
2021-07-12 06:07:40 +00:00
|
|
|
|
|
|
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
|
!endif
|
|
|
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2022-03-31 05:48:14 +00:00
|
|
|
index ea0c338b9b..4189be2ff2 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2022-03-31 05:48:14 +00:00
|
|
|
@@ -895,10 +895,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
!endif
|
|
|
|
|
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
- }
|
|
|
|
|
OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2022-03-31 05:48:14 +00:00
|
|
|
index d851e47180..d89ecd32a8 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2022-03-31 05:48:14 +00:00
|
|
|
@@ -286,7 +286,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
2021-07-12 06:07:40 +00:00
|
|
|
|
|
|
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
|
!endif
|
|
|
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
2022-03-31 05:48:14 +00:00
|
|
|
index 591b4cb430..d46db1208d 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
2022-03-31 05:48:14 +00:00
|
|
|
@@ -892,10 +892,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
!endif
|
|
|
|
|
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
- }
|
|
|
|
|
OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf {
|
|
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
2022-03-31 05:48:14 +00:00
|
|
|
index 4e7be9f2e7..90773a6de7 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
2022-03-31 05:48:14 +00:00
|
|
|
@@ -308,7 +308,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
2021-07-12 06:07:40 +00:00
|
|
|
|
|
|
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
|
!endif
|
|
|
|
|
INF ShellPkg/Application/Shell/Shell.inf
|
|
|
|
|
--
|
2022-03-31 05:48:14 +00:00
|
|
|
2.31.1
|
2021-07-12 06:07:40 +00:00
|
|
|
|
