114 lines
4.2 KiB
Diff
114 lines
4.2 KiB
Diff
|
From 08daf5b41ee0926d5e3ed40b6dad24166fac95ee 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:25 +0200
|
||
|
|
Subject: [PATCH 13/19] OvmfPkg: Remove TftpDynamicCommand from shell (RHEL
|
||
|
|
only)
|
||
|
|
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
|
||
|
|
index 4b30b0e461..caa335bed5 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
@@ -907,10 +907,6 @@
|
||
|
|
!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
|
||
|
|
index 8e21668044..a6d0645c3f 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
@@ -290,7 +290,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!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
|
||
|
|
index faff80d56b..52cc9edffc 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
@@ -921,10 +921,6 @@
|
||
|
|
!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
|
||
|
|
index 40f68b0425..3fa5273f89 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
@@ -291,7 +291,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!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
|
||
|
|
index 6bfe64e892..6e1d5409e3 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
@@ -919,10 +919,6 @@
|
||
|
|
!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
|
||
|
|
index b127f225bb..1e332d2a73 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
@@ -303,7 +303,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!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
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|