d55cbecee7
- Rebase to edk2-stable-202205 [bz#2074831] - Resolves: bz#2074831 (rebase edk2 to May 2022 release (edk2-stable202205))
130 lines
5.4 KiB
Diff
130 lines
5.4 KiB
Diff
From 8629f2920b4fc035f1c5d7caed561c2f921d88cf 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:19 +0200
|
|
Subject: OvmfPkg: Remove UdfDxe filesystem driver (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: [11/19] 21614de37221fca27d4eec0f03c5c8bce5911af3
|
|
RH-Bugzilla: 1967747
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
Remove the UDF driver.
|
|
|
|
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/AmdSev/AmdSevX64.dsc | 1 -
|
|
OvmfPkg/AmdSev/AmdSevX64.fdf | 1 -
|
|
OvmfPkg/OvmfPkgIa32.dsc | 1 -
|
|
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 1 -
|
|
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
OvmfPkg/OvmfPkgX64.dsc | 1 -
|
|
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
8 files changed, 8 deletions(-)
|
|
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
index df78cab21b..0c93556798 100644
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
|
|
@@ -713,7 +713,6 @@
|
|
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
|
|
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
|
FatPkg/EnhancedFatDxe/Fat.inf
|
|
- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
|
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
|
diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
index d653ed3419..998e517dfb 100644
|
|
--- a/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf
|
|
@@ -272,7 +272,6 @@ INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf
|
|
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
-INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE
|
|
INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
|
index c2bbc70d25..b09350104e 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
|
@@ -815,7 +815,6 @@
|
|
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
|
|
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
|
FatPkg/EnhancedFatDxe/Fat.inf
|
|
- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
|
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf
|
|
index 45b624d450..b56c749e39 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
|
@@ -294,7 +294,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
|
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
-INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
index 4fd7715442..5b9c221ce7 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
@@ -829,7 +829,6 @@
|
|
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
|
|
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
|
FatPkg/EnhancedFatDxe/Fat.inf
|
|
- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
|
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
index 449e40dfdd..1b0685bca5 100644
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
@@ -295,7 +295,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
|
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
-INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
|
index 002399e1ad..11a041afb2 100644
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
|
@@ -894,7 +894,6 @@
|
|
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf
|
|
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
|
FatPkg/EnhancedFatDxe/Fat.inf
|
|
- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf
|
|
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf
|
|
OvmfPkg/SataControllerDxe/SataControllerDxe.inf
|
|
diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf
|
|
index 78e7328841..5dc09a14fd 100644
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
|
@@ -320,7 +320,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf
|
|
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
|
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
-INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
!ifndef $(EXCLUDE_SHELL_FROM_FD)
|
|
!if $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
--
|
|
2.31.1
|
|
|