2022-10-11 08:54:13 +00:00
|
|
|
From 4b85a8d082e58f90ab3418125f82b63ee801150c 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:25 +0200
|
2022-02-01 12:58:25 +00:00
|
|
|
Subject: OvmfPkg: Remove TftpDynamicCommand 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: [13/19] cf9ef346386ac89fa05b29d429d8d1b27cf0e3b0
|
|
|
|
|
RH-Bugzilla: 1967747
|
|
|
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
|
|
|
|
|
|
Remove the command to download files in the shell via TFTP.
|
|
|
|
|
|
|
|
|
|
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-10-11 08:54:13 +00:00
|
|
|
index 1546fc1284..3147b1a757 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
2022-10-11 08:54:13 +00:00
|
|
|
@@ -902,10 +902,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
!endif
|
|
|
|
|
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
- }
|
|
|
|
|
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
index b56c749e39..8599834ac4 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
@@ -297,7 +297,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/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
|
|
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
|
!endif
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2022-10-11 08:54:13 +00:00
|
|
|
index 1a5f0663b4..daf8a02b63 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2022-10-11 08:54:13 +00:00
|
|
|
@@ -916,10 +916,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
!endif
|
|
|
|
|
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
- }
|
|
|
|
|
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
index 1b0685bca5..aab5e2934a 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
@@ -298,7 +298,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/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
|
|
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
|
!endif
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
2022-10-11 08:54:13 +00:00
|
|
|
index 4e77e54085..fcdc141304 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
2022-10-11 08:54:13 +00:00
|
|
|
@@ -981,10 +981,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
!endif
|
|
|
|
|
|
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
|
|
- <PcdsFixedAtBuild>
|
|
|
|
|
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
- }
|
|
|
|
|
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
|
|
<PcdsFixedAtBuild>
|
|
|
|
|
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
index 5dc09a14fd..b02e35fed3 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
@@ -323,7 +323,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/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
|
|
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
|
|
!endif
|
|
|
|
|
--
|
2022-03-31 05:48:14 +00:00
|
|
|
2.31.1
|
2021-07-12 06:07:40 +00:00
|
|
|
|
