110 lines
4.7 KiB
Diff
110 lines
4.7 KiB
Diff
|
From 90b02d61d206926d6b2687a4a94f600039ae2e7c 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] 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 62907e9458..c2fe2e6042 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
||
|
|
@@ -881,10 +881,6 @@
|
||
|
|
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||
|
|
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
||
|
|
- 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 6c324943e4..32a42c926b 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
||
|
|
@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!if $(BUILD_SHELL) == TRUE && $(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 28cf5ace70..5d74007599 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
||
|
|
@@ -895,10 +895,6 @@
|
||
|
|
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||
|
|
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
||
|
|
- 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 a890d4a3e3..733f60ce7c 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
||
|
|
@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!if $(BUILD_SHELL) == TRUE && $(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 ca0c007181..f27932b38d 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
||
|
|
@@ -963,10 +963,6 @@
|
||
|
|
MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf
|
||
|
|
|
||
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
||
|
|
- 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 48da04eb9c..f562b5312b 100644
|
||
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
||
|
|
@@ -317,7 +317,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
||
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
||
|
|
|
||
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
||
|
|
-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
||
|
|
INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf
|
||
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
||
|
|
!endif
|