|
 |
be6997 |
From b206b9f1f20b8741c184e55d97cd10475b15affa Mon Sep 17 00:00:00 2001
|
|
|
7439a5 |
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
|
7439a5 |
Date: Thu, 1 Jul 2021 20:29:25 +0200
|
|
|
7439a5 |
Subject: OvmfPkg: Remove TftpDynamicCommand from shell (RHEL only)
|
|
|
7439a5 |
MIME-Version: 1.0
|
|
|
7439a5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
7439a5 |
Content-Transfer-Encoding: 8bit
|
|
|
7439a5 |
|
|
|
7439a5 |
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
7439a5 |
RH-MergeRequest: 3: Disable features for RHEL9
|
|
|
7439a5 |
RH-Commit: [13/19] cf9ef346386ac89fa05b29d429d8d1b27cf0e3b0
|
|
|
7439a5 |
RH-Bugzilla: 1967747
|
|
|
7439a5 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
7439a5 |
|
|
|
7439a5 |
Remove the command to download files in the shell via TFTP.
|
|
|
7439a5 |
|
|
|
7439a5 |
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
7439a5 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
7439a5 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7439a5 |
---
|
|
|
7439a5 |
OvmfPkg/OvmfPkgIa32.dsc | 4 ----
|
|
|
7439a5 |
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
|
7439a5 |
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
|
|
|
7439a5 |
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
|
7439a5 |
OvmfPkg/OvmfPkgX64.dsc | 4 ----
|
|
|
7439a5 |
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
|
7439a5 |
6 files changed, 15 deletions(-)
|
|
|
7439a5 |
|
|
|
7439a5 |
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
be6997 |
index b09350104e..97837145b2 100644
|
|
|
7439a5 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
7439a5 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
be6997 |
@@ -903,10 +903,6 @@
|
|
|
7439a5 |
!endif
|
|
|
7439a5 |
|
|
|
7439a5 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
7439a5 |
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
7439a5 |
- <PcdsFixedAtBuild>
|
|
|
7439a5 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
7439a5 |
- }
|
|
|
7439a5 |
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
7439a5 |
<PcdsFixedAtBuild>
|
|
|
7439a5 |
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
7439a5 |
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
be6997 |
index b56c749e39..8599834ac4 100644
|
|
|
7439a5 |
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
7439a5 |
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
be6997 |
@@ -297,7 +297,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
7439a5 |
|
|
|
7439a5 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
7439a5 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
7439a5 |
-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
7439a5 |
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
7439a5 |
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
7439a5 |
!endif
|
|
|
7439a5 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
be6997 |
index 5b9c221ce7..699fbc8381 100644
|
|
|
7439a5 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
7439a5 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
be6997 |
@@ -917,10 +917,6 @@
|
|
|
7439a5 |
!endif
|
|
|
7439a5 |
|
|
|
7439a5 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
7439a5 |
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
7439a5 |
- <PcdsFixedAtBuild>
|
|
|
7439a5 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
7439a5 |
- }
|
|
|
7439a5 |
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
7439a5 |
<PcdsFixedAtBuild>
|
|
|
7439a5 |
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
7439a5 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
be6997 |
index 1b0685bca5..aab5e2934a 100644
|
|
|
7439a5 |
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
7439a5 |
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
be6997 |
@@ -298,7 +298,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
7439a5 |
|
|
|
7439a5 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
7439a5 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
7439a5 |
-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
7439a5 |
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
7439a5 |
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
7439a5 |
!endif
|
|
|
7439a5 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
be6997 |
index 11a041afb2..3b55dbbb74 100644
|
|
|
7439a5 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
7439a5 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
be6997 |
@@ -982,10 +982,6 @@
|
|
|
7439a5 |
!endif
|
|
|
7439a5 |
|
|
|
7439a5 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
7439a5 |
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
7439a5 |
- <PcdsFixedAtBuild>
|
|
|
7439a5 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
7439a5 |
- }
|
|
|
7439a5 |
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
7439a5 |
<PcdsFixedAtBuild>
|
|
|
7439a5 |
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
7439a5 |
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
be6997 |
index 5dc09a14fd..b02e35fed3 100644
|
|
|
7439a5 |
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
7439a5 |
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
be6997 |
@@ -323,7 +323,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
7439a5 |
|
|
|
7439a5 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
7439a5 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
7439a5 |
-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
7439a5 |
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
7439a5 |
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
7439a5 |
!endif
|
|
|
7439a5 |
--
|
|
|
be6997 |
2.31.1
|
|
|
7439a5 |
|