2022-12-15 12:45:35 +00:00
|
|
|
From 1ba8ead93467fad1f2583c1650f28ca039da8405 Mon Sep 17 00:00:00 2001
|
2021-07-12 06:07:40 +00:00
|
|
|
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
|
|
|
|
|
Date: Thu, 1 Jul 2021 20:29:13 +0200
|
2022-02-01 12:58:25 +00:00
|
|
|
Subject: OvmfPkg: Remove VirtioFsDxe filesystem driver (RHEL only)
|
2021-07-12 06:07:40 +00:00
|
|
|
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: [9/19] b40d8a6b9c38568a74fb922b12bbae9f0e721f95
|
|
|
|
|
RH-Bugzilla: 1967747
|
|
|
|
|
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
|
|
|
|
|
|
|
Remove the virtio-fs 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/OvmfPkgIa32.dsc | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgIa32.fdf | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgIa32X64.dsc | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgIa32X64.fdf | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgX64.dsc | 1 -
|
|
|
|
|
OvmfPkg/OvmfPkgX64.fdf | 1 -
|
|
|
|
|
6 files changed, 6 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
|
2022-12-15 12:45:35 +00:00
|
|
|
index 49877b613b..7550113f51 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.dsc
|
2022-12-15 12:45:35 +00:00
|
|
|
@@ -832,7 +832,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
|
|
|
|
FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
|
|
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
|
- OvmfPkg/VirtioFsDxe/VirtioFsDxe.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
|
2022-12-15 12:45:35 +00:00
|
|
|
index 306950bd87..3efa27bbac 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
@@ -295,7 +295,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
2021-07-12 06:07:40 +00:00
|
|
|
|
|
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
|
|
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
|
-INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
|
|
|
|
|
|
2022-12-15 12:45:35 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
2021-07-12 06:07:40 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2022-12-15 12:45:35 +00:00
|
|
|
index d6a2300c7a..2ef1368945 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
|
2022-12-15 12:45:35 +00:00
|
|
|
@@ -846,7 +846,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
|
|
|
|
FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
|
|
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
|
- OvmfPkg/VirtioFsDxe/VirtioFsDxe.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
|
2022-12-15 12:45:35 +00:00
|
|
|
index 88ea4c6b65..5b73560782 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgIa32X64.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgIa32X64.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
@@ -296,7 +296,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
2021-07-12 06:07:40 +00:00
|
|
|
|
|
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
|
|
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
|
-INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
|
|
|
|
|
|
2022-12-15 12:45:35 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
2021-07-12 06:07:40 +00:00
|
|
|
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
|
2022-12-15 12:45:35 +00:00
|
|
|
index 2bc5ae576b..c336aca5a6 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.dsc
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.dsc
|
2022-12-15 12:45:35 +00:00
|
|
|
@@ -914,7 +914,6 @@
|
2021-07-12 06:07:40 +00:00
|
|
|
MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf
|
|
|
|
|
FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
|
|
MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
|
- OvmfPkg/VirtioFsDxe/VirtioFsDxe.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
|
2022-12-15 12:45:35 +00:00
|
|
|
index 608ebdd4d2..ad98806b32 100644
|
2021-07-12 06:07:40 +00:00
|
|
|
--- a/OvmfPkg/OvmfPkgX64.fdf
|
|
|
|
|
+++ b/OvmfPkg/OvmfPkgX64.fdf
|
2022-06-13 11:24:03 +00:00
|
|
|
@@ -321,7 +321,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour
|
2021-07-12 06:07:40 +00:00
|
|
|
|
|
|
|
|
INF FatPkg/EnhancedFatDxe/Fat.inf
|
|
|
|
|
INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf
|
|
|
|
|
-INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf
|
|
|
|
|
|
2022-12-15 12:45:35 +00:00
|
|
|
!if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5"
|
|
|
|
|
INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf
|
2021-07-12 06:07:40 +00:00
|
|
|
--
|
2022-12-15 12:45:35 +00:00
|
|
|
2.38.1
|
2021-07-12 06:07:40 +00:00
|
|
|
|
