|
|
75d8e7 |
From db62fdc2ea07ba0796820c0f4aaa02e3a36c0b27 Mon Sep 17 00:00:00 2001
|
|
|
c4e3b2 |
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
|
c4e3b2 |
Date: Thu, 1 Jul 2021 20:29:25 +0200
|
|
|
75d8e7 |
Subject: OvmfPkg: Remove TftpDynamicCommand from shell (RHEL only)
|
|
|
c4e3b2 |
MIME-Version: 1.0
|
|
|
c4e3b2 |
Content-Type: text/plain; charset=UTF-8
|
|
|
c4e3b2 |
Content-Transfer-Encoding: 8bit
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
c4e3b2 |
RH-MergeRequest: 3: Disable features for RHEL9
|
|
|
c4e3b2 |
RH-Commit: [13/19] cf9ef346386ac89fa05b29d429d8d1b27cf0e3b0
|
|
|
c4e3b2 |
RH-Bugzilla: 1967747
|
|
|
c4e3b2 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
Remove the command to download files in the shell via TFTP.
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
Suggested-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
c4e3b2 |
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
|
c4e3b2 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
c4e3b2 |
---
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgIa32.dsc | 4 ----
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgIa32X64.dsc | 4 ----
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgX64.dsc | 4 ----
|
|
|
c4e3b2 |
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
|
c4e3b2 |
6 files changed, 15 deletions(-)
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
75d8e7 |
index 47dc58b2f2..3e7cd1f0ff 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
75d8e7 |
@@ -910,10 +910,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
c4e3b2 |
<PcdsFixedAtBuild>
|
|
|
c4e3b2 |
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
75d8e7 |
index 04bd804471..61c3db7a13 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
75d8e7 |
@@ -287,7 +287,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
c4e3b2 |
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
c4e3b2 |
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
75d8e7 |
index dc5c6681c5..450db0b473 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
75d8e7 |
@@ -924,10 +924,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
c4e3b2 |
<PcdsFixedAtBuild>
|
|
|
c4e3b2 |
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
75d8e7 |
index 36433d984c..56781d84e4 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
c4e3b2 |
@@ -291,7 +291,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
c4e3b2 |
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
c4e3b2 |
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
75d8e7 |
index 17a11f81ae..07d028b294 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
|
75d8e7 |
@@ -922,10 +922,6 @@
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf {
|
|
|
c4e3b2 |
- <PcdsFixedAtBuild>
|
|
|
c4e3b2 |
- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
- }
|
|
|
c4e3b2 |
ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf {
|
|
|
c4e3b2 |
<PcdsFixedAtBuild>
|
|
|
c4e3b2 |
gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
|
|
|
c4e3b2 |
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
75d8e7 |
index ed0d60b5e0..959736a1be 100644
|
|
|
c4e3b2 |
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
c4e3b2 |
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
|
|
75d8e7 |
@@ -307,7 +307,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
c4e3b2 |
|
|
|
c4e3b2 |
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
|
c4e3b2 |
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
c4e3b2 |
-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
|
|
c4e3b2 |
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
|
|
c4e3b2 |
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
|
c4e3b2 |
!endif
|
|
|
c4e3b2 |
--
|
|
|
c4e3b2 |
2.27.0
|
|
|
c4e3b2 |
|