From d55cbecee7db42b28f5757afd1de4ace529bcd4a Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Mon, 13 Jun 2022 07:24:03 -0400 Subject: [PATCH] * Mon Jun 13 2022 Miroslav Rezanina - 20220526git16779ede2d36-1 - Rebase to edk2-stable-202205 [bz#2074831] - Resolves: bz#2074831 (rebase edk2 to May 2022 release (edk2-stable202205)) --- 0002-Remove-submodules.patch | 4 +- ...-max-debug-message-length-to-512-RHE.patch | 2 +- ...minalDxe-add-other-text-resolutions-.patch | 2 +- ...minalDxe-set-xterm-resolution-on-mod.patch | 14 +- ...ResizeXterm-from-the-QEMU-command-li.patch | 143 +++++++++++++----- ...PcdResizeXterm-from-the-QEMU-command.patch | 8 +- ...clusion-of-the-shell-from-the-firmwa.patch | 14 +- ...ntroduce-fixed-PCD-for-early-hello-m.patch | 2 +- ...rePeiCore-write-early-hello-message-.patch | 10 +- ...tPkg-set-early-hello-message-RH-only.patch | 4 +- ...mfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch | 18 +-- ...DEBUG_VERBOSE-0x00400000-in-QemuVide.patch | 18 +-- ...ce-DEBUG_VERBOSE-0x00400000-in-QemuR.patch | 10 +- ...bDxe-Do-not-report-DXE-failure-on-Aa.patch | 2 +- ...EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch | 18 +-- ...lLib-list-RHEL8-specific-OpenSSL-fil.patch | 10 +- ...elLoaderFsDxe-suppress-error-on-no-k.patch | 2 +- ...Dxe-suppress-error-on-no-swtpm-in-si.patch | 2 +- 0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch | 96 ++++++------ 0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch | 6 +- ...ve-VirtioGpu-device-driver-RHEL-only.patch | 34 ++--- ...emuRamfbDxe-display-device-driver-RH.patch | 141 ----------------- ...irtioFsDxe-filesystem-driver-RHEL-on.patch | 26 ++-- ...e-QemuRamfbDxe-display-device-driver.patch | 71 --------- ...e-VirtioFsDxe-filesystem-driver-RHEL.patch | 12 +- ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 34 ++--- ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 12 +- ...ftpDynamicCommand-from-shell-RHEL-on.patch | 26 ++-- ...e-TftpDynamicCommand-from-shell-RHEL.patch | 8 +- ...ttpDynamicCommand-from-shell-RHEL-on.patch | 26 ++-- ...e-HttpDynamicCommand-from-shell-RHEL.patch | 8 +- ...inuxInitrdDynamicShellCommand-RHEL-o.patch | 34 ++--- ...e-LinuxInitrdDynamicShellCommand-RHE.patch | 8 +- ...g-Remove-QemuRamfbDxe-display-device.patch | 68 --------- ...emove-QemuRamfbDxe-display-device-dr.patch | 139 ----------------- edk2.spec | 39 +++-- sources | 4 +- 37 files changed, 361 insertions(+), 714 deletions(-) delete mode 100644 0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch rename 0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch => 0024-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch (85%) delete mode 100644 0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch rename 0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch => 0025-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch (89%) rename 0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch => 0026-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch (86%) rename 0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch => 0027-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch (90%) rename 0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch => 0028-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch (87%) rename 0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch => 0029-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch (91%) rename 0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch => 0030-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch (86%) rename 0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch => 0031-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch (91%) rename 0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch => 0032-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch (86%) rename 0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch => 0033-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch (91%) delete mode 100644 edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch delete mode 100644 edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch diff --git a/0002-Remove-submodules.patch b/0002-Remove-submodules.patch index 319ca19..59f422e 100644 --- a/0002-Remove-submodules.patch +++ b/0002-Remove-submodules.patch @@ -1,4 +1,4 @@ -From 6c54a6c652f1d61e4529f294e2572ea52b651e64 Mon Sep 17 00:00:00 2001 +From 5fa2d2bbc8c9d3c9ff5a0293c3b2fa756bddd500 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Thu, 24 Mar 2022 03:23:02 -0400 Subject: Remove submodules @@ -75,7 +75,7 @@ index 8c191e0c38..3eae824a1c 100644 EfiRom \ GenFfs \ diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 463e889e9a..9d69fb86ed 100644 +index 2bcb9f9453..f549276b80 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -24,9 +24,6 @@ diff --git a/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch index 6097f68..57a578b 100644 --- a/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch +++ b/0003-OvmfPkg-increase-max-debug-message-length-to-512-RHE.patch @@ -1,4 +1,4 @@ -From b7cf93f965db141a2a2c4b22a82019ef70f105ec Mon Sep 17 00:00:00 2001 +From 7c341fac71b9c0530d2593da20ca2bd8cd363f2f Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Thu, 20 Feb 2014 22:54:45 +0100 Subject: OvmfPkg: increase max debug message length to 512 (RHEL only) diff --git a/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch index deb5c81..9bd3411 100644 --- a/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch +++ b/0004-MdeModulePkg-TerminalDxe-add-other-text-resolutions-.patch @@ -1,4 +1,4 @@ -From 87a34da0ea42ec9809238a7907e89768b7568e48 Mon Sep 17 00:00:00 2001 +From 83f28ee21b44c881c793bae51a9bf84dcb17304f Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 18:40:35 +0100 Subject: MdeModulePkg: TerminalDxe: add other text resolutions (RHEL only) diff --git a/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index 6885099..10c6e4b 100644 --- a/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0005-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,9 +1,13 @@ -From 959ce7766f18a33eee6840072efa232406f35677 Mon Sep 17 00:00:00 2001 +From c540bfb48919613f58aa902ca30a922fd1406603 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 22:40:01 +0100 Subject: MdeModulePkg: TerminalDxe: set xterm resolution on mode change (RH only) +Notes for rebase to edk2-stable202205: + +- Minor context changes due to fd306d1dbc MdeModulePkg: Add PcdTdxSharedBitMask + Notes for rebase to edk2-stable202202: - Minor context changes due to 1436aea4d MdeModulePkg: Apply uncrustify changes @@ -91,12 +95,12 @@ Signed-off-by: Laszlo Ersek 3 files changed, 36 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 9d69fb86ed..08d59dfb3e 100644 +index f549276b80..1415766054 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -2076,6 +2076,10 @@ - # @Prompt Enable PCIe Resizable BAR Capability support. - gEfiMdeModulePkgTokenSpaceGuid.PcdPcieResizableBarSupport|FALSE|BOOLEAN|0x10000024 +@@ -2092,6 +2092,10 @@ + # @Prompt The shared bit mask when Intel Tdx is enabled. + gEfiMdeModulePkgTokenSpaceGuid.PcdTdxSharedBitMask|0x0|UINT64|0x10000025 + ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal + # mode change. diff --git a/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index fdc2ca8..766210c 100644 --- a/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0006-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,8 +1,12 @@ -From 153b345b1542ece437bb137666a8e1f2ca02582a Mon Sep 17 00:00:00 2001 +From 4c43c025cb288c7dc2fe5043fd7601e90a4b361a Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 15:59:06 +0200 Subject: OvmfPkg: take PcdResizeXterm from the QEMU command line (RH only) +Notes about edk2-stable202205 rebase + +- Necessary minor fixes for upstream changes + Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -66,79 +70,138 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit 2cc462ee963d0be119bc97bfc9c70d292a40516f) (cherry picked from commit 51e0de961029af84b5bdbfddcc9762b1819d500f) --- - OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + - OvmfPkg/OvmfPkgIa32.dsc | 1 + - OvmfPkg/OvmfPkgIa32X64.dsc | 1 + - OvmfPkg/OvmfPkgX64.dsc | 1 + - OvmfPkg/PlatformPei/Platform.c | 1 + - OvmfPkg/PlatformPei/PlatformPei.inf | 1 + - 6 files changed, 6 insertions(+) + OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + + OvmfPkg/CloudHv/CloudHvX64.dsc | 1 + + OvmfPkg/IntelTdx/IntelTdxX64.dsc | 1 + + OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- + OvmfPkg/OvmfPkgIa32.dsc | 1 + + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + + OvmfPkg/OvmfPkgX64.dsc | 1 + + OvmfPkg/PlatformPei/Platform.c | 13 +++++++++++++ + OvmfPkg/PlatformPei/PlatformPei.inf | 1 + + 9 files changed, 21 insertions(+), 1 deletion(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index fd56176796..d1f9bc6d0d 100644 +index fc1fdb2e22..ae23094ffc 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -519,6 +519,7 @@ +@@ -524,6 +524,7 @@ [PcdsDynamicDefault] gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 +diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc +index 92664f319b..4aa54e4dc3 100644 +--- a/OvmfPkg/CloudHv/CloudHvX64.dsc ++++ b/OvmfPkg/CloudHv/CloudHvX64.dsc +@@ -574,6 +574,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + !if $(SMM_REQUIRE) == FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 +diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc +index dd8d446f4a..ec1aab6f09 100644 +--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc ++++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc +@@ -461,6 +461,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 +diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc +index f8fc977cb2..02ce394e18 100644 +--- a/OvmfPkg/Microvm/MicrovmX64.dsc ++++ b/OvmfPkg/Microvm/MicrovmX64.dsc +@@ -556,7 +556,7 @@ + # only set when + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 +- + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 85abed24c1..6bcd222af7 100644 +index a9841cbfc3..b69e3c05a2 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -580,6 +580,7 @@ - # ($(SMM_REQUIRE) == FALSE) - gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 - -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE - !if $(SMM_REQUIRE) == FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index a9c1daecc1..0cce3b768e 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -586,6 +586,7 @@ - # ($(SMM_REQUIRE) == FALSE) - gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 - -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE - !if $(SMM_REQUIRE) == FALSE - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 718399299f..847cf6a466 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc @@ -585,6 +585,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + !if $(SMM_REQUIRE) == FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index f7949780fa..726011ec42 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -593,6 +593,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE + !if $(SMM_REQUIRE) == FALSE + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index 1448f925b7..ab2e31ea8f 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -612,6 +612,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + + gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index d0323c6451..9011a55d0f 100644 +index f006755d5f..b8f5690251 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c -@@ -851,6 +851,7 @@ InitializePlatform ( +@@ -41,6 +41,18 @@ + + #include "Platform.h" + ++#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \ ++ do { \ ++ BOOLEAN Setting; \ ++ RETURN_STATUS PcdStatus; \ ++ \ ++ if (!RETURN_ERROR (QemuFwCfgParseBool ( \ ++ "opt/ovmf/" #TokenName, &Setting))) { \ ++ PcdStatus = PcdSetBoolS (TokenName, Setting); \ ++ ASSERT_RETURN_ERROR (PcdStatus); \ ++ } \ ++ } while (0) ++ + EFI_HOB_PLATFORM_INFO mPlatformInfoHob = { 0 }; + + EFI_PEI_PPI_DESCRIPTOR mPpiBootMode[] = { +@@ -387,6 +399,7 @@ InitializePlatform ( MemTypeInfoInitialization (); - MemMapInitialization (); + MemMapInitialization (&mPlatformInfoHob); NoexecDxeInitialization (); + UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm); } InstallClearCacheCallback (); diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf -index 8ef404168c..80bcb9f00b 100644 +index 00372fa0eb..2dfa357c38 100644 --- a/OvmfPkg/PlatformPei/PlatformPei.inf +++ b/OvmfPkg/PlatformPei/PlatformPei.inf -@@ -95,6 +95,7 @@ +@@ -98,6 +98,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved diff --git a/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index 43e7464..3206c3d 100644 --- a/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0007-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,4 +1,4 @@ -From e04bca0b35055d250b5cbcc157ce48374464981b Mon Sep 17 00:00:00 2001 +From 70f686c8654a7c7059cac13bf89b9c61edb059ef Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:50 +0000 Subject: ArmVirtPkg: take PcdResizeXterm from the QEMU command line (RH only) @@ -95,10 +95,10 @@ Signed-off-by: Laszlo Ersek create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index b2b0d304d3..6960df62b0 100644 +index aa0ce61630..7705bf3919 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -282,6 +282,8 @@ +@@ -284,6 +284,8 @@ gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0 !endif @@ -107,7 +107,7 @@ index b2b0d304d3..6960df62b0 100644 [PcdsDynamicHii] gArmVirtTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gArmVirtVariableGuid|0x0|FALSE|NV,BS -@@ -384,7 +386,10 @@ +@@ -386,7 +388,10 @@ MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf diff --git a/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch index 16abff5..7a96fd3 100644 --- a/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch +++ b/0008-OvmfPkg-allow-exclusion-of-the-shell-from-the-firmwa.patch @@ -1,4 +1,4 @@ -From 92c3ba455a5915219d04b79d5973421cd312c1f3 Mon Sep 17 00:00:00 2001 +From 8c739e3281704f16973cf1e93f544d9475bcbecf Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 4 Nov 2014 23:02:53 +0100 Subject: OvmfPkg: allow exclusion of the shell from the firmware image (RH @@ -111,10 +111,10 @@ Signed-off-by: Laszlo Ersek 3 files changed, 6 insertions(+) diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index a6b2142ccd..b5bc8407e7 100644 +index 57d13b7130..69044874e2 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -283,12 +283,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -298,12 +298,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -130,10 +130,10 @@ index a6b2142ccd..b5bc8407e7 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 49266dd467..f4fa19bb01 100644 +index ccde366887..bf535bef42 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -287,12 +287,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -299,12 +299,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf @@ -149,10 +149,10 @@ index 49266dd467..f4fa19bb01 100644 INF MdeModulePkg/Logo/LogoDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index ba7f26d01d..dfd17804c2 100644 +index 438806fba8..21e4ce00dd 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -309,12 +309,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -324,12 +324,14 @@ INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf diff --git a/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch index 7700ea4..1fb4ac2 100644 --- a/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch +++ b/0009-ArmPlatformPkg-introduce-fixed-PCD-for-early-hello-m.patch @@ -1,4 +1,4 @@ -From b39609b03bd62b77344685e57ea62fb3616554a3 Mon Sep 17 00:00:00 2001 +From 2a0ac4b748825dcd9e2957870a3c317c16c35691 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:49:43 +0200 Subject: ArmPlatformPkg: introduce fixed PCD for early hello message (RH only) diff --git a/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch index 0ab93ff..f726c1b 100644 --- a/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch +++ b/0010-ArmPlatformPkg-PrePeiCore-write-early-hello-message-.patch @@ -1,4 +1,4 @@ -From 589072612e6d60fff3ed162b6b79421f3afd6e37 Mon Sep 17 00:00:00 2001 +From 2963ff004a52543e54098d6eded5780db8ef6dbe Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 13:59:20 +0200 Subject: ArmPlatformPkg: PrePeiCore: write early hello message to the serial @@ -117,10 +117,10 @@ index 0345dd7bdd..ae8302becd 100644 #include #include diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf -index fb01dd1a11..a6681c1032 100644 +index a5b4722459..ea7b220bc8 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf -@@ -69,6 +69,8 @@ +@@ -66,6 +66,8 @@ gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize @@ -130,10 +130,10 @@ index fb01dd1a11..a6681c1032 100644 gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase gArmTokenSpaceGuid.PcdGicSgiIntId diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf -index e9eb092d3a..c98dc82f0c 100644 +index 466a2b01c3..29fb8737cb 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf -@@ -67,4 +67,6 @@ +@@ -64,4 +64,6 @@ gArmPlatformTokenSpaceGuid.PcdCPUCorePrimaryStackSize gArmPlatformTokenSpaceGuid.PcdCPUCoreSecondaryStackSize diff --git a/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch index eaec260..1908766 100644 --- a/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch +++ b/0011-ArmVirtPkg-set-early-hello-message-RH-only.patch @@ -1,4 +1,4 @@ -From 95106e31861778d5841a0e7854166441e602d443 Mon Sep 17 00:00:00 2001 +From 28f12646106e2b2451d0f204b1d24d9c38e1dbfb Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 14:07:17 +0200 Subject: ArmVirtPkg: set early hello message (RH only) @@ -66,7 +66,7 @@ Signed-off-by: Laszlo Ersek 1 file changed, 1 insertion(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 6960df62b0..847a82ac52 100644 +index 7705bf3919..ae35cc1800 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -134,6 +134,7 @@ diff --git a/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch index c51e20d..56031de 100644 --- a/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0012-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,4 +1,4 @@ -From 649b84c7d662d78cc09a66aac662b74809464452 Mon Sep 17 00:00:00 2001 +From f3012d4439380458fe18917c4162ed95a91102e1 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:45 +0100 Subject: OvmfPkg: enable DEBUG_VERBOSE (RHEL only) @@ -65,10 +65,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index d1f9bc6d0d..538a0c77f6 100644 +index ae23094ffc..ccc46c974b 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -471,7 +471,7 @@ +@@ -476,7 +476,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -78,10 +78,10 @@ index d1f9bc6d0d..538a0c77f6 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 6bcd222af7..91a3c8f9dd 100644 +index b69e3c05a2..bbe4e91037 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -520,7 +520,7 @@ +@@ -525,7 +525,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -91,10 +91,10 @@ index 6bcd222af7..91a3c8f9dd 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 0cce3b768e..1a7ba6e6ea 100644 +index 726011ec42..072f06c0a3 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -524,7 +524,7 @@ +@@ -531,7 +531,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -104,10 +104,10 @@ index 0cce3b768e..1a7ba6e6ea 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 847cf6a466..1a7afc7646 100644 +index ab2e31ea8f..46661408f9 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -525,7 +525,7 @@ +@@ -548,7 +548,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error diff --git a/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch index a6f234e..523776e 100644 --- a/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +++ b/0013-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch @@ -1,4 +1,4 @@ -From 37fda72f5894c81a8c67441a17c98ed4e20a9261 Mon Sep 17 00:00:00 2001 +From f6c7b0992ea1ffa4760ac899800220c9df3a289d Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:46 +0100 Subject: OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in @@ -82,10 +82,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 538a0c77f6..ea4070eedb 100644 +index ccc46c974b..c66ad3af1a 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -715,8 +715,14 @@ +@@ -726,8 +726,14 @@ MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf @@ -103,10 +103,10 @@ index 538a0c77f6..ea4070eedb 100644 # diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 91a3c8f9dd..37d1d4b9a5 100644 +index bbe4e91037..b37a5a6da9 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -812,9 +812,15 @@ +@@ -830,9 +830,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -125,10 +125,10 @@ index 91a3c8f9dd..37d1d4b9a5 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 1a7ba6e6ea..948e1a5ba5 100644 +index 072f06c0a3..b0e8c20e93 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -826,9 +826,15 @@ +@@ -844,9 +844,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) @@ -147,10 +147,10 @@ index 1a7ba6e6ea..948e1a5ba5 100644 # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 1a7afc7646..46799406b6 100644 +index 46661408f9..6211d5e934 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -823,9 +823,15 @@ +@@ -909,9 +909,15 @@ MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf !ifndef $(CSM_ENABLE) diff --git a/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index c326370..96c23ed 100644 --- a/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +++ b/0014-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch @@ -1,4 +1,4 @@ -From f2bac25df3fdd03d496f7671baf72897b743e0e3 Mon Sep 17 00:00:00 2001 +From ce89db0328822a99820e19c6af8bbc22cc0682fb Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 Subject: ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in QemuRamfbDxe (RH @@ -61,10 +61,10 @@ Signed-off-by: Laszlo Ersek 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 847a82ac52..d94a8cdd69 100644 +index ae35cc1800..f30c1e622c 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -509,7 +509,10 @@ +@@ -511,7 +511,10 @@ # # Video support # @@ -77,10 +77,10 @@ index 847a82ac52..d94a8cdd69 100644 OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 36343f347b..99189055d8 100644 +index 7f7d15d6ee..14f7b29991 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -438,7 +438,10 @@ +@@ -440,7 +440,10 @@ # # Video support # diff --git a/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch index d52705f..a74bc69 100644 --- a/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +++ b/0015-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch @@ -1,4 +1,4 @@ -From b7026b8a2e60f964a3c970e4e8cbfe4c8667dee5 Mon Sep 17 00:00:00 2001 +From f632bade0de20d4b34eb6225e40c6e4c325bed5c Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daude Date: Thu, 1 Aug 2019 20:43:48 +0200 Subject: OvmfPkg: QemuRamfbDxe: Do not report DXE failure on Aarch64 silent diff --git a/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index 4cf087e..a25f2e5 100644 --- a/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0016-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -1,4 +1,4 @@ -From 3b349bdd364d83f79fb5b91cc8ddb078efd7276f Mon Sep 17 00:00:00 2001 +From d832a41efb2d0e199af57fc1c79b750e57978cde Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:47 +0100 Subject: OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe (RH @@ -63,10 +63,10 @@ Signed-off-by: Paolo Bonzini 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index ea4070eedb..b9718ff03f 100644 +index c66ad3af1a..7df6e5c825 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -709,7 +709,10 @@ +@@ -720,7 +720,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -79,10 +79,10 @@ index ea4070eedb..b9718ff03f 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 37d1d4b9a5..4dfd338531 100644 +index b37a5a6da9..ed6a820d2e 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -805,7 +805,10 @@ +@@ -823,7 +823,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -95,10 +95,10 @@ index 37d1d4b9a5..4dfd338531 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 948e1a5ba5..63721e5d17 100644 +index b0e8c20e93..b5be86cff3 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -819,7 +819,10 @@ +@@ -837,7 +837,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -111,10 +111,10 @@ index 948e1a5ba5..63721e5d17 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 46799406b6..cac0391c08 100644 +index 6211d5e934..29b45e68e3 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -816,7 +816,10 @@ +@@ -902,7 +902,10 @@ OvmfPkg/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf diff --git a/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch index c954559..094aebf 100644 --- a/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch +++ b/0017-CryptoPkg-OpensslLib-list-RHEL8-specific-OpenSSL-fil.patch @@ -1,4 +1,4 @@ -From 25bb2c2ae96229dfe64663e8a4870063c3ece80e Mon Sep 17 00:00:00 2001 +From 724b271c0cb45063c3cbe230031091186f623ba8 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sat, 16 Nov 2019 17:11:27 +0100 Subject: CryptoPkg/OpensslLib: list RHEL8-specific OpenSSL files in the INFs @@ -131,10 +131,10 @@ Signed-off-by: Laszlo Ersek 2 files changed, 22 insertions(+) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -index d84bde056a..19913a4ac6 100644 +index c899b811b1..4a89dc82b6 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf -@@ -570,6 +570,17 @@ +@@ -620,6 +620,17 @@ $(OPENSSL_PATH)/ssl/statem/statem.h $(OPENSSL_PATH)/ssl/statem/statem_local.h # Autogenerated files list ends here @@ -153,10 +153,10 @@ index d84bde056a..19913a4ac6 100644 ossl_store.c rand_pool.c diff --git a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -index cdeed0d073..5057857e8d 100644 +index 0ec3724541..f1cc0aaf9f 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -@@ -519,6 +519,17 @@ +@@ -569,6 +569,17 @@ $(OPENSSL_PATH)/crypto/x509v3/standard_exts.h $(OPENSSL_PATH)/crypto/x509v3/v3_admis.h # Autogenerated files list ends here diff --git a/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index 406e9cc..6a878d8 100644 --- a/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +++ b/0018-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch @@ -1,4 +1,4 @@ -From c6748cfa88c31d43540a9ac512e149a359161b94 Mon Sep 17 00:00:00 2001 +From 52f3c8a18f3b38818f0371e3e7207a26dc614006 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:31:36 +0200 Subject: OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" in diff --git a/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch index bdd76e7..33289f2 100644 --- a/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +++ b/0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch @@ -1,4 +1,4 @@ -From 4285894bcd3ee256708458345562b637804c946a Mon Sep 17 00:00:00 2001 +From 83b201c9fa9c8c3bded3b4e8c13de797588fe7bd Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:40:09 +0200 Subject: SecurityPkg/Tcg2Dxe: suppress error on no swtpm in silent aa64 build diff --git a/0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch b/0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch index a370b59..a37e68f 100644 --- a/0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +++ b/0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch @@ -1,4 +1,4 @@ -From 990e2b3467164922bdd49c3182e56e04911a436e Mon Sep 17 00:00:00 2001 +From 68367bc0cc395bd3d2c45b9d74c65638de39d2d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:28:49 +0200 Subject: OvmfPkg: Remove EbcDxe (RHEL only) @@ -29,100 +29,100 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index b9718ff03f..358ff978c2 100644 +index 7df6e5c825..02c3cf9242 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -636,7 +636,6 @@ +@@ -648,7 +648,6 @@ !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - OvmfPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf + OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 14b5b5593f..2c1dfe5fae 100644 +index 844ba8a116..e49125e0e8 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -199,7 +199,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf - - INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf - INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf --INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - INF OvmfPkg/8259InterruptControllerDxe/8259.inf - INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf - INF UefiCpuPkg/CpuDxe/CpuDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 4dfd338531..cdd86f22ec 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -720,7 +720,6 @@ - !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc - } - -- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - OvmfPkg/8259InterruptControllerDxe/8259.inf - UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf - UefiCpuPkg/CpuDxe/CpuDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index b5bc8407e7..fd26488ee4 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -205,7 +205,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - INF OvmfPkg/8259InterruptControllerDxe/8259.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 63721e5d17..9c18028d9e 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc + INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index ed6a820d2e..d9d9d89d45 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -734,7 +734,6 @@ !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - OvmfPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf UefiCpuPkg/CpuDxe/CpuDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index f4fa19bb01..b3533abce9 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -209,7 +209,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf + !ifdef $(CSM_ENABLE) +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 69044874e2..209a82f922 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -216,7 +216,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - INF OvmfPkg/8259InterruptControllerDxe/8259.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf INF UefiCpuPkg/CpuDxe/CpuDxe.inf + !ifdef $(CSM_ENABLE) +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index b5be86cff3..088461cb3c 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -748,7 +748,6 @@ + !include OvmfPkg/OvmfTpmSecurityStub.dsc.inc + } + +- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf + UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf + UefiCpuPkg/CpuDxe/CpuDxe.inf + !ifdef $(CSM_ENABLE) +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index bf535bef42..70eb60b370 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -217,7 +217,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf + + INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf + INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf +-INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf + INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf + INF UefiCpuPkg/CpuDxe/CpuDxe.inf + !ifdef $(CSM_ENABLE) diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index cac0391c08..9a882226de 100644 +index 29b45e68e3..73455fe8fe 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -731,7 +731,6 @@ +@@ -790,7 +790,6 @@ !endif } - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - OvmfPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf - UefiCpuPkg/CpuDxe/CpuDxe.inf + + UefiCpuPkg/CpuDxe/CpuDxe.inf { diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index dfd17804c2..588b2deb7f 100644 +index 21e4ce00dd..f0bb39f398 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -231,7 +231,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -239,7 +239,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -INF MdeModulePkg/Universal/EbcDxe/EbcDxe.inf - INF OvmfPkg/8259InterruptControllerDxe/8259.inf INF UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf + INF UefiCpuPkg/CpuDxe/CpuDxe.inf -- 2.31.1 diff --git a/0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch b/0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch index f4864bf..acf3c0c 100644 --- a/0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch +++ b/0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch @@ -1,4 +1,4 @@ -From c435ca7c8549b3ef71e29c9d1b731a65760e177a Mon Sep 17 00:00:00 2001 +From eb88cf0cc2cf381e2258c69908c6409a0967cf13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:28:54 +0200 Subject: ArmVirtPkg: Remove EbcDxe (RHEL only) @@ -23,10 +23,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 10 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index ba711deac0..e64acbc5cf 100644 +index f15a3f7f06..8ec1119484 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -423,8 +423,3 @@ +@@ -420,8 +420,3 @@ NULL|EmbeddedPkg/Library/PlatformHasAcpiLib/PlatformHasAcpiLib.inf } diff --git a/0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch b/0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch index 41dcfb3..bf083a5 100644 --- a/0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch +++ b/0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From fe9c142814935e1c492f6cd98857559211f75123 Mon Sep 17 00:00:00 2001 +From c7cf2e16a397fdcae2c4d11a706a5a15c79cc569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:28:59 +0200 Subject: OvmfPkg: Remove VirtioGpu device driver (RHEL only) @@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 358ff978c2..32e27664a6 100644 +index 02c3cf9242..df78cab21b 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -725,7 +725,6 @@ +@@ -736,7 +736,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -41,10 +41,10 @@ index 358ff978c2..32e27664a6 100644 # # ISA Support diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 2c1dfe5fae..b264128da4 100644 +index e49125e0e8..d653ed3419 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -293,7 +293,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -298,7 +298,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -53,10 +53,10 @@ index 2c1dfe5fae..b264128da4 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index cdd86f22ec..480c5212a1 100644 +index d9d9d89d45..1a3dc33fbb 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -823,7 +823,6 @@ +@@ -841,7 +841,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -65,10 +65,10 @@ index cdd86f22ec..480c5212a1 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index fd26488ee4..cddab565ac 100644 +index 209a82f922..1e7868ebab 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -318,7 +318,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +@@ -333,7 +333,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf !endif INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -77,10 +77,10 @@ index fd26488ee4..cddab565ac 100644 INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 9c18028d9e..510e4502f2 100644 +index 088461cb3c..13dab4fcec 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -837,7 +837,6 @@ +@@ -855,7 +855,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -89,10 +89,10 @@ index 9c18028d9e..510e4502f2 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index b3533abce9..73eb4e10d9 100644 +index 70eb60b370..a2f78fb182 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -327,7 +327,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +@@ -339,7 +339,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf !endif INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf @@ -101,10 +101,10 @@ index b3533abce9..73eb4e10d9 100644 INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 9a882226de..9db7c98ff8 100644 +index 73455fe8fe..a51a765778 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -834,7 +834,6 @@ +@@ -920,7 +920,6 @@ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F } @@ -113,10 +113,10 @@ index 9a882226de..9db7c98ff8 100644 # # ISA Support diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 588b2deb7f..5716783d23 100644 +index f0bb39f398..1495565c05 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -349,7 +349,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +@@ -366,7 +366,6 @@ INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf !endif INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf diff --git a/0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch b/0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch deleted file mode 100644 index 30efe84..0000000 --- a/0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch +++ /dev/null @@ -1,141 +0,0 @@ -From 551cf28aeedca3c7cb5b08dcd23b37a473d85265 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= -Date: Fri, 2 Jul 2021 20:15:40 +0200 -Subject: OvmfPkg: Remove QemuRamfbDxe display device driver (RHEL only) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Philippe Mathieu-Daudé -RH-MergeRequest: 3: Disable features for RHEL9 -RH-Commit: [5/19] 657c6d4406600a34ad57cd0f93018716d73f2cd1 -RH-Bugzilla: 1967747 -RH-Acked-by: Laszlo Ersek - -The ramfb display device driver is not needed for RHEL. - -Suggested-by: Laszlo Ersek -Signed-off-by: Philippe Mathieu-Daudé -Signed-off-by: Miroslav Rezanina ---- - OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ---- - OvmfPkg/AmdSev/AmdSevX64.fdf | 1 - - OvmfPkg/OvmfPkgIa32.dsc | 4 ---- - OvmfPkg/OvmfPkgIa32.fdf | 1 - - OvmfPkg/OvmfPkgIa32X64.dsc | 4 ---- - OvmfPkg/OvmfPkgIa32X64.fdf | 1 - - OvmfPkg/OvmfPkgX64.dsc | 4 ---- - OvmfPkg/OvmfPkgX64.fdf | 1 - - 8 files changed, 20 deletions(-) - -diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 32e27664a6..0204812c4d 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.dsc -+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -721,10 +721,6 @@ - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -- } - - # - # ISA Support -diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index b264128da4..1aa387dbd4 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.fdf -+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -292,7 +292,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - --INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 480c5212a1..c204f893b5 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -819,10 +819,6 @@ - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } - !endif -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -- } - - # - # ISA Support -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index cddab565ac..279db25da1 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -317,7 +317,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - !endif - --INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf - -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 510e4502f2..1197f17848 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -833,10 +833,6 @@ - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } - !endif -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -- } - - # - # ISA Support -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 73eb4e10d9..8cebb4049e 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -326,7 +326,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - !endif - --INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 9db7c98ff8..b09ac55f41 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -830,10 +830,6 @@ - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } - !endif -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -- } - - # - # ISA Support -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 5716783d23..6e7db8164c 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -348,7 +348,6 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - !endif - --INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf --- -2.31.1 - diff --git a/0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch b/0024-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch similarity index 85% rename from 0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch rename to 0024-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch index 8757b8b..52d61ae 100644 --- a/0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +++ b/0024-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch @@ -1,4 +1,4 @@ -From 23546fcbb2e18773f450b5029fe68d15a31d6919 Mon Sep 17 00:00:00 2001 +From 8ee6f680c5c8428ae098898654917b2c88e79f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:13 +0200 Subject: OvmfPkg: Remove VirtioFsDxe filesystem driver (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 6 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index c204f893b5..fc8f07d15f 100644 +index 1a3dc33fbb..c2bbc70d25 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -798,7 +798,6 @@ +@@ -816,7 +816,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -39,10 +39,10 @@ index c204f893b5..fc8f07d15f 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 279db25da1..6998f242ad 100644 +index 1e7868ebab..45b624d450 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -280,7 +280,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -295,7 +295,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -51,10 +51,10 @@ index 279db25da1..6998f242ad 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 1197f17848..857221b475 100644 +index 13dab4fcec..4fd7715442 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -812,7 +812,6 @@ +@@ -830,7 +830,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -63,10 +63,10 @@ index 1197f17848..857221b475 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 8cebb4049e..e454f9cd70 100644 +index a2f78fb182..449e40dfdd 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -284,7 +284,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -296,7 +296,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -75,10 +75,10 @@ index 8cebb4049e..e454f9cd70 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index b09ac55f41..8c9f8c7cca 100644 +index a51a765778..002399e1ad 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -809,7 +809,6 @@ +@@ -895,7 +895,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -87,10 +87,10 @@ index b09ac55f41..8c9f8c7cca 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 6e7db8164c..d0b8eb362f 100644 +index 1495565c05..78e7328841 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -306,7 +306,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -321,7 +321,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf diff --git a/0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch b/0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch deleted file mode 100644 index bfc6b43..0000000 --- a/0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 3c3aea0f37377981dbfc1470c188fbd370ddeeb3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= -Date: Thu, 1 Jul 2021 20:29:02 +0200 -Subject: ArmVirtPkg: Remove QemuRamfbDxe display device driver (RHEL only) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -RH-Author: Philippe Mathieu-Daudé -RH-MergeRequest: 3: Disable features for RHEL9 -RH-Commit: [6/19] 4e08ed3eb98f0901ae033d76c12b62d89f67f6e7 -RH-Bugzilla: 1967747 -RH-Acked-by: Laszlo Ersek - -The ramfb display device driver is only potentially needed for -aarch64 Windows guests, which are not supported by RHEL. - -Suggested-by: Laszlo Ersek -Signed-off-by: Philippe Mathieu-Daudé -Signed-off-by: Miroslav Rezanina ---- - ArmVirtPkg/ArmVirtQemu.dsc | 4 ---- - ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 - - ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ---- - 3 files changed, 9 deletions(-) - -diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index d94a8cdd69..8d820d5772 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -509,10 +509,6 @@ - # - # Video support - # -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF -- } - OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - OvmfPkg/PlatformDxe/Platform.inf - -diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 7872861330..7d5d5ffebb 100644 ---- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -161,7 +161,6 @@ READ_LOCK_STATUS = TRUE - # - # Video support - # -- INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - INF OvmfPkg/PlatformDxe/Platform.inf - -diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 99189055d8..85e155127f 100644 ---- a/ArmVirtPkg/ArmVirtQemuKernel.dsc -+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -438,10 +438,6 @@ - # - # Video support - # -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -- -- gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF -- } - OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - OvmfPkg/PlatformDxe/Platform.inf - --- -2.31.1 - diff --git a/0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch b/0025-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch similarity index 89% rename from 0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch rename to 0025-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch index dafc612..d725811 100644 --- a/0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +++ b/0025-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch @@ -1,4 +1,4 @@ -From f0fa2fa860196279b7c4477893e6baf097c250a2 Mon Sep 17 00:00:00 2001 +From 75f939f74828f870ad92ceef9710a9fb8e5002d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:16 +0200 Subject: ArmVirtPkg: Remove VirtioFsDxe filesystem driver (RHEL only) @@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 8d820d5772..f19b7c042d 100644 +index f30c1e622c..3db71198c5 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -427,7 +427,6 @@ +@@ -429,7 +429,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf @@ -36,7 +36,7 @@ index 8d820d5772..f19b7c042d 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 7d5d5ffebb..27ed97afc5 100644 +index 7872861330..ddd014ac34 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -84,7 +84,6 @@ READ_LOCK_STATUS = TRUE @@ -48,10 +48,10 @@ index 7d5d5ffebb..27ed97afc5 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 85e155127f..c00f3bfa47 100644 +index 14f7b29991..65cc8a9aac 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -356,7 +356,6 @@ +@@ -358,7 +358,6 @@ MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf diff --git a/0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0026-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch similarity index 86% rename from 0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch rename to 0026-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index d32c3ba..ab9814f 100644 --- a/0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +++ b/0026-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From b3e7dfb9cf751a677f1c15b8b9ac4f89051658d8 Mon Sep 17 00:00:00 2001 +From 8629f2920b4fc035f1c5d7caed561c2f921d88cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:19 +0200 Subject: OvmfPkg: Remove UdfDxe filesystem driver (RHEL only) @@ -29,10 +29,10 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 8 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 0204812c4d..9f75ce90c2 100644 +index df78cab21b..0c93556798 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -702,7 +702,6 @@ +@@ -713,7 +713,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -41,10 +41,10 @@ index 0204812c4d..9f75ce90c2 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 1aa387dbd4..0a09246f47 100644 +index d653ed3419..998e517dfb 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -267,7 +267,6 @@ INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf +@@ -272,7 +272,6 @@ INF OvmfPkg/AcpiPlatformDxe/AcpiPlatformDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -53,10 +53,10 @@ index 1aa387dbd4..0a09246f47 100644 !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index fc8f07d15f..5ef39dcc46 100644 +index c2bbc70d25..b09350104e 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -797,7 +797,6 @@ +@@ -815,7 +815,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -65,10 +65,10 @@ index fc8f07d15f..5ef39dcc46 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 6998f242ad..d9689ecca0 100644 +index 45b624d450..b56c749e39 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -279,7 +279,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -294,7 +294,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -77,10 +77,10 @@ index 6998f242ad..d9689ecca0 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 857221b475..6fbc78fa06 100644 +index 4fd7715442..5b9c221ce7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -811,7 +811,6 @@ +@@ -829,7 +829,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -89,10 +89,10 @@ index 857221b475..6fbc78fa06 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index e454f9cd70..9b41cdeff4 100644 +index 449e40dfdd..1b0685bca5 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -283,7 +283,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -295,7 +295,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf @@ -101,10 +101,10 @@ index e454f9cd70..9b41cdeff4 100644 !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 8c9f8c7cca..525f4c9e32 100644 +index 002399e1ad..11a041afb2 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -808,7 +808,6 @@ +@@ -894,7 +894,6 @@ MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -113,10 +113,10 @@ index 8c9f8c7cca..525f4c9e32 100644 MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf OvmfPkg/SataControllerDxe/SataControllerDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index d0b8eb362f..7b409d5c35 100644 +index 78e7328841..5dc09a14fd 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -305,7 +305,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -320,7 +320,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf INF FatPkg/EnhancedFatDxe/Fat.inf diff --git a/0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0027-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch similarity index 90% rename from 0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch rename to 0027-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch index 6481c20..16ec715 100644 --- a/0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +++ b/0027-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -1,4 +1,4 @@ -From 98d6ed1341d7f2cb8f14334250c25b940eef28fb Mon Sep 17 00:00:00 2001 +From bf8a0e72a6916b84086fd37571f8774231104e3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:22 +0200 Subject: ArmVirtPkg: Remove UdfDxe filesystem driver (RHEL only) @@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina 3 files changed, 3 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index f19b7c042d..a9733583b2 100644 +index 3db71198c5..4f37a62dca 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -426,7 +426,6 @@ +@@ -428,7 +428,6 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf @@ -36,7 +36,7 @@ index f19b7c042d..a9733583b2 100644 # # Bds diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 27ed97afc5..192b0d4a3f 100644 +index ddd014ac34..6065f4759c 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -83,7 +83,6 @@ READ_LOCK_STATUS = TRUE @@ -48,10 +48,10 @@ index 27ed97afc5..192b0d4a3f 100644 # # Status Code Routing diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index c00f3bfa47..fb0792525d 100644 +index 65cc8a9aac..868e6e1e24 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -355,7 +355,6 @@ +@@ -357,7 +357,6 @@ MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf FatPkg/EnhancedFatDxe/Fat.inf diff --git a/0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch b/0028-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch similarity index 87% rename from 0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch rename to 0028-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch index cfd95d2..74fbaad 100644 --- a/0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +++ b/0028-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From 49657fe4a687caf9e87819c943ca9a46904c4086 Mon Sep 17 00:00:00 2001 +From b206b9f1f20b8741c184e55d97cd10475b15affa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:25 +0200 Subject: OvmfPkg: Remove TftpDynamicCommand from shell (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 15 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 5ef39dcc46..cc37177297 100644 +index b09350104e..97837145b2 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -881,10 +881,6 @@ +@@ -903,10 +903,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -42,10 +42,10 @@ index 5ef39dcc46..cc37177297 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index d9689ecca0..22079c83cc 100644 +index b56c749e39..8599834ac4 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -282,7 +282,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -297,7 +297,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -54,10 +54,10 @@ index d9689ecca0..22079c83cc 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 6fbc78fa06..ea0c338b9b 100644 +index 5b9c221ce7..699fbc8381 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -895,10 +895,6 @@ +@@ -917,10 +917,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -69,10 +69,10 @@ index 6fbc78fa06..ea0c338b9b 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 9b41cdeff4..d851e47180 100644 +index 1b0685bca5..aab5e2934a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -286,7 +286,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -298,7 +298,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -81,10 +81,10 @@ index 9b41cdeff4..d851e47180 100644 INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf !endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 525f4c9e32..591b4cb430 100644 +index 11a041afb2..3b55dbbb74 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -892,10 +892,6 @@ +@@ -982,10 +982,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -96,10 +96,10 @@ index 525f4c9e32..591b4cb430 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 7b409d5c35..4e7be9f2e7 100644 +index 5dc09a14fd..b02e35fed3 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -308,7 +308,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -323,7 +323,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch b/0029-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch similarity index 91% rename from 0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch rename to 0029-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch index e231ecc..5f9399f 100644 --- a/0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch +++ b/0029-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch @@ -1,4 +1,4 @@ -From 3b983b889b2482adff0f6e275908aaaa95a17edf Mon Sep 17 00:00:00 2001 +From 4e8100ca78aff2bbdea3614b30ccb1fc4d6759d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:28 +0200 Subject: ArmVirtPkg: Remove TftpDynamicCommand from shell (RHEL only) @@ -23,10 +23,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index e64acbc5cf..560979f1d2 100644 +index 8ec1119484..fbca3ebd8d 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -377,10 +377,9 @@ +@@ -374,10 +374,9 @@ # MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf @@ -41,7 +41,7 @@ index e64acbc5cf..560979f1d2 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 192b0d4a3f..04f2a838ca 100644 +index 6065f4759c..ec5f4c95b1 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE diff --git a/0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch b/0030-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch similarity index 86% rename from 0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch rename to 0030-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch index f3eb1e1..8e4406f 100644 --- a/0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +++ b/0030-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch @@ -1,4 +1,4 @@ -From 58473c715a0091df93972e117f8adddb8d527f63 Mon Sep 17 00:00:00 2001 +From 1c1385ba38640e0c75672e327542b8ff887a4009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:31 +0200 Subject: OvmfPkg: Remove HttpDynamicCommand from shell (RHEL only) @@ -27,10 +27,10 @@ Signed-off-by: Miroslav Rezanina 6 files changed, 15 deletions(-) diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index cc37177297..18349c4652 100644 +index 97837145b2..4906a6635f 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -881,10 +881,6 @@ +@@ -903,10 +903,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -42,10 +42,10 @@ index cc37177297..18349c4652 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 22079c83cc..89f91bd08e 100644 +index 8599834ac4..edcba6ad30 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -282,7 +282,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -297,7 +297,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -54,10 +54,10 @@ index 22079c83cc..89f91bd08e 100644 !endif INF ShellPkg/Application/Shell/Shell.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index ea0c338b9b..4189be2ff2 100644 +index 699fbc8381..d2f37df3cb 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -895,10 +895,6 @@ +@@ -917,10 +917,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -69,10 +69,10 @@ index ea0c338b9b..4189be2ff2 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index d851e47180..d89ecd32a8 100644 +index aab5e2934a..cb01a23a24 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -286,7 +286,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -298,7 +298,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -81,10 +81,10 @@ index d851e47180..d89ecd32a8 100644 !endif INF ShellPkg/Application/Shell/Shell.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 591b4cb430..d46db1208d 100644 +index 3b55dbbb74..113aff39c7 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -892,10 +892,6 @@ +@@ -982,10 +982,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -96,10 +96,10 @@ index 591b4cb430..d46db1208d 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 4e7be9f2e7..90773a6de7 100644 +index b02e35fed3..8e2eeb22ee 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -308,7 +308,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -323,7 +323,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch b/0031-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch similarity index 91% rename from 0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch rename to 0031-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch index 7264e1c..21941a2 100644 --- a/0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch +++ b/0031-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch @@ -1,4 +1,4 @@ -From 35acf33fae0c594ec92ba1ba9c2b898b45a522e8 Mon Sep 17 00:00:00 2001 +From 2b8ed79ba959069e2e11f438dba1973ecda9114a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:34 +0200 Subject: ArmVirtPkg: Remove HttpDynamicCommand from shell (RHEL only) @@ -23,10 +23,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 560979f1d2..7a0c507528 100644 +index fbca3ebd8d..e65aa442c2 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -380,10 +380,6 @@ +@@ -377,10 +377,6 @@ # # UEFI application (Shell Embedded Boot Loader) # @@ -38,7 +38,7 @@ index 560979f1d2..7a0c507528 100644 gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index 04f2a838ca..d42781d967 100644 +index ec5f4c95b1..f2298012ed 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE diff --git a/0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch b/0032-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch similarity index 86% rename from 0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch rename to 0032-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch index 41cd9a7..484be96 100644 --- a/0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +++ b/0032-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch @@ -1,4 +1,4 @@ -From 53060371fbc07acf0f490cbeab48c221c3e93ff9 Mon Sep 17 00:00:00 2001 +From 9c6fc3adbd32e137fd6017f3b6cee3bcb822d838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:39 +0200 Subject: OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only) @@ -34,10 +34,10 @@ Signed-off-by: Miroslav Rezanina 8 files changed, 20 deletions(-) diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 9f75ce90c2..7b14dfd1ae 100644 +index 0c93556798..3a65f7fe88 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -755,10 +755,6 @@ +@@ -770,10 +770,6 @@ MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -49,10 +49,10 @@ index 9f75ce90c2..7b14dfd1ae 100644 OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf OvmfPkg/AmdSev/Grub/Grub.inf diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 0a09246f47..29d9827294 100644 +index 998e517dfb..e598414343 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -269,7 +269,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -274,7 +274,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour INF FatPkg/EnhancedFatDxe/Fat.inf !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE @@ -61,10 +61,10 @@ index 0a09246f47..29d9827294 100644 INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf INF OvmfPkg/AmdSev/Grub/Grub.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 18349c4652..f5314a3862 100644 +index 4906a6635f..f0e398cccd 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -881,10 +881,6 @@ +@@ -903,10 +903,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -76,10 +76,10 @@ index 18349c4652..f5314a3862 100644 ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 89f91bd08e..818d894262 100644 +index edcba6ad30..840c79788c 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -282,7 +282,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -297,7 +297,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -88,10 +88,10 @@ index 89f91bd08e..818d894262 100644 INF ShellPkg/Application/Shell/Shell.inf !endif diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 4189be2ff2..6116654aa8 100644 +index d2f37df3cb..d8d820aa99 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -895,10 +895,6 @@ +@@ -917,10 +917,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -103,10 +103,10 @@ index 4189be2ff2..6116654aa8 100644 ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index d89ecd32a8..5bf9ce771f 100644 +index cb01a23a24..37c4d52cc7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -286,7 +286,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -298,7 +298,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -115,10 +115,10 @@ index d89ecd32a8..5bf9ce771f 100644 INF ShellPkg/Application/Shell/Shell.inf !endif diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index d46db1208d..e7cbee5d08 100644 +index 113aff39c7..8781f0c9cf 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -892,10 +892,6 @@ +@@ -982,10 +982,6 @@ !endif !if $(TOOL_CHAIN_TAG) != "XCODE5" @@ -130,10 +130,10 @@ index d46db1208d..e7cbee5d08 100644 ShellPkg/Application/Shell/Shell.inf { diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index 90773a6de7..c894db8c3b 100644 +index 8e2eeb22ee..fc8954f8a6 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -308,7 +308,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -323,7 +323,6 @@ INF FatPkg/EnhancedFatDxe/Fat.inf !ifndef $(EXCLUDE_SHELL_FROM_FD) !if $(TOOL_CHAIN_TAG) != "XCODE5" diff --git a/0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch b/0033-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch similarity index 91% rename from 0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch rename to 0033-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch index 787a554..0e27c70 100644 --- a/0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch +++ b/0033-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch @@ -1,4 +1,4 @@ -From 275d3be82ff8cace8921c1f299a1b053b74acd01 Mon Sep 17 00:00:00 2001 +From c1839d5fc8723c92bb012a654926576d11b7fa0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Date: Thu, 1 Jul 2021 20:29:46 +0200 Subject: ArmVirtPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only) @@ -24,10 +24,10 @@ Signed-off-by: Miroslav Rezanina 2 files changed, 5 deletions(-) diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc -index 7a0c507528..2a8c978d96 100644 +index e65aa442c2..4cb14fa041 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc -@@ -380,10 +380,6 @@ +@@ -377,10 +377,6 @@ # # UEFI application (Shell Embedded Boot Loader) # @@ -39,7 +39,7 @@ index 7a0c507528..2a8c978d96 100644 ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index d42781d967..a5c7769455 100644 +index f2298012ed..43a4eafae4 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -98,7 +98,6 @@ READ_LOCK_STATUS = TRUE diff --git a/edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch b/edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch deleted file mode 100644 index 12a6aaf..0000000 --- a/edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 9415f40efd2fec3bec6d7144169622ca97d4d6de Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Tue, 24 May 2022 04:40:06 -0400 -Subject: [PATCH 1/2] Revert "ArmVirtPkg: Remove QemuRamfbDxe display device - driver (RHEL only)" - -RH-Author: Miroslav Rezanina -RH-MergeRequest: 12: Revert "ArmVirtPkg: Remove QemuRamfbDxe display device driver (RHEL only)" -RH-Commit: [1/2] cee67de4c6cec6951511f666203cd22546f7f9d9 (mrezanin/centos-src-edk2) -RH-Bugzilla: 2087220 -RH-Acked-by: Oliver Steffen -RH-Acked-by: Laszlo Ersek -RH-Acked-by: Gerd Hoffmann - -This reverts commit 3c3aea0f37377981dbfc1470c188fbd370ddeeb3. - -Signed-off-by: Miroslav Rezanina ---- - ArmVirtPkg/ArmVirtQemu.dsc | 4 ++++ - ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 + - ArmVirtPkg/ArmVirtQemuKernel.dsc | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index a9733583b2..656bdc8095 100644 ---- a/ArmVirtPkg/ArmVirtQemu.dsc -+++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -507,6 +507,10 @@ - # - # Video support - # -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF -+ } - OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - OvmfPkg/PlatformDxe/Platform.inf - -diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -index a5c7769455..43a4eafae4 100644 ---- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc -@@ -156,6 +156,7 @@ READ_LOCK_STATUS = TRUE - # - # Video support - # -+ INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - INF OvmfPkg/PlatformDxe/Platform.inf - -diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index fb0792525d..2ecdd843c4 100644 ---- a/ArmVirtPkg/ArmVirtQemuKernel.dsc -+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -436,6 +436,10 @@ - # - # Video support - # -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF -+ } - OvmfPkg/VirtioGpuDxe/VirtioGpu.inf - OvmfPkg/PlatformDxe/Platform.inf - --- -2.31.1 - diff --git a/edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch b/edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch deleted file mode 100644 index aed35d6..0000000 --- a/edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 5b23da3b951f3764a941e15e6e6a422c345b37f6 Mon Sep 17 00:00:00 2001 -From: Miroslav Rezanina -Date: Tue, 24 May 2022 04:40:19 -0400 -Subject: [PATCH 2/2] Revert "OvmfPkg: Remove QemuRamfbDxe display device - driver (RHEL only)" - -RH-Author: Miroslav Rezanina -RH-MergeRequest: 12: Revert "ArmVirtPkg: Remove QemuRamfbDxe display device driver (RHEL only)" -RH-Commit: [2/2] f7680cbbdc5e1b456292017342838f6e96636c94 (mrezanin/centos-src-edk2) -RH-Bugzilla: 2087220 -RH-Acked-by: Oliver Steffen -RH-Acked-by: Laszlo Ersek -RH-Acked-by: Gerd Hoffmann - -This reverts commit 551cf28aeedca3c7cb5b08dcd23b37a473d85265. - -Signed-off-by: Miroslav Rezanina ---- - OvmfPkg/AmdSev/AmdSevX64.dsc | 4 ++++ - OvmfPkg/AmdSev/AmdSevX64.fdf | 1 + - OvmfPkg/OvmfPkgIa32.dsc | 4 ++++ - OvmfPkg/OvmfPkgIa32.fdf | 1 + - OvmfPkg/OvmfPkgIa32X64.dsc | 4 ++++ - OvmfPkg/OvmfPkgIa32X64.fdf | 1 + - OvmfPkg/OvmfPkgX64.dsc | 4 ++++ - OvmfPkg/OvmfPkgX64.fdf | 1 + - 8 files changed, 20 insertions(+) - -diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc -index 7b14dfd1ae..696dd470a2 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.dsc -+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -720,6 +720,10 @@ - - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - - # - # ISA Support -diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf -index 29d9827294..7a1c357406 100644 ---- a/OvmfPkg/AmdSev/AmdSevX64.fdf -+++ b/OvmfPkg/AmdSev/AmdSevX64.fdf -@@ -290,6 +290,7 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf - - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - -+INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index f5314a3862..d3583ba18a 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -817,6 +817,10 @@ - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } - !endif -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - - # - # ISA Support -diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf -index 818d894262..2ebe1d53f5 100644 ---- a/OvmfPkg/OvmfPkgIa32.fdf -+++ b/OvmfPkg/OvmfPkgIa32.fdf -@@ -312,6 +312,7 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - !endif - -+INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf - -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 6116654aa8..a373a405ff 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -831,6 +831,10 @@ - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } - !endif -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - - # - # ISA Support -diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf -index 5bf9ce771f..d72b0c333a 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.fdf -+++ b/OvmfPkg/OvmfPkgIa32X64.fdf -@@ -321,6 +321,7 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - !endif - -+INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index e7cbee5d08..2dc172a767 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -828,6 +828,10 @@ - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F - } - !endif -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } - - # - # ISA Support -diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf -index c894db8c3b..df70ccff09 100644 ---- a/OvmfPkg/OvmfPkgX64.fdf -+++ b/OvmfPkg/OvmfPkgX64.fdf -@@ -343,6 +343,7 @@ INF RuleOverride=CSM OvmfPkg/Csm/Csm16/Csm16.inf - INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - !endif - -+INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf - INF OvmfPkg/PlatformDxe/Platform.inf - INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf - INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf --- -2.31.1 - diff --git a/edk2.spec b/edk2.spec index 6fe6304..e1682a2 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,7 +1,7 @@ ExclusiveArch: x86_64 aarch64 -%define GITDATE 20220221 -%define GITCOMMIT b24306f15d +%define GITDATE 20220526 +%define GITCOMMIT 16779ede2d36 %define TOOLCHAIN GCC5 %define OPENSSL_VER 1.1.1k @@ -24,13 +24,13 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 2%{?dist} +Release: 1%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT URL: http://www.tianocore.org # The source tarball is created using following commands: -# COMMIT=b24306f15d +# COMMIT=16779ede2d36 # git archive --format=tar --prefix=edk2-$COMMIT/ $COMMIT \ # | xz -9ev >/tmp/edk2-$COMMIT.tar.xz Source0:edk2-%{GITCOMMIT}.tar.xz @@ -68,22 +68,16 @@ Patch0019: 0019-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch Patch0021: 0021-OvmfPkg-Remove-EbcDxe-RHEL-only.patch Patch0022: 0022-ArmVirtPkg-Remove-EbcDxe-RHEL-only.patch Patch0023: 0023-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch -Patch0024: 0024-OvmfPkg-Remove-QemuRamfbDxe-display-device-driver-RH.patch -Patch0025: 0025-ArmVirtPkg-Remove-QemuRamfbDxe-display-device-driver.patch -Patch0026: 0026-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch -Patch0027: 0027-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch -Patch0028: 0028-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch -Patch0029: 0029-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch -Patch0030: 0030-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch -Patch0031: 0031-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch -Patch0032: 0032-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch -Patch0033: 0033-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch -Patch0034: 0034-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch -Patch0035: 0035-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch -# For bz#2087220 - VNC display show "Guest has not initialized the display" when using ramfb + ovmf -Patch36: edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch -# For bz#2087220 - VNC display show "Guest has not initialized the display" when using ramfb + ovmf -Patch37: edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch +Patch0024: 0024-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +Patch0025: 0025-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +Patch0026: 0026-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +Patch0027: 0027-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +Patch0028: 0028-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +Patch0029: 0029-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch +Patch0030: 0030-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +Patch0031: 0031-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch +Patch0032: 0032-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +Patch0033: 0033-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch # python3-devel and libuuid-devel are required for building tools. @@ -534,6 +528,11 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$') %changelog +* Mon Jun 13 2022 Miroslav Rezanina - 20220526git16779ede2d36-1 +- Rebase to edk2-stable-202205 [bz#2074831] +- Resolves: bz#2074831 + (rebase edk2 to May 2022 release (edk2-stable202205)) + * Thu May 26 2022 Miroslav Rezanina - 20220221gitb24306f15d-2 - edk2-Revert-ArmVirtPkg-Remove-QemuRamfbDxe-display-device.patch [bz#2087220] - edk2-Revert-OvmfPkg-Remove-QemuRamfbDxe-display-device-dr.patch [bz#2087220] diff --git a/sources b/sources index 911b267..69a9a88 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (edk2-b24306f15d.tar.xz) = af70744119c962ff50e32bfa97d744d4a0aa0f2109626675325f9c49cbda06b579c09f7ef818d641e7842d50af867ee0a572916d043e40d8a275eca6d3b89aaa -SHA512 (openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz) = cb8fa59c8ae1ce8bb1bc43a7776b1a3110ed9e563f9cb6d8da0f7b882d41ac318a069f01ce9feb8ce9f80c414e0bdf47145a1de96fce8a7f205f5f5342e5ea35 +SHA512 (edk2-16779ede2d36.tar.xz) = ab4fe5208506d93796db45cdcc63b95d99ebeb34e4783ede9b4bb411befe0dd09adf64b2cdf390180bc5c007ac5cde3b9692d4bf4c536261631ecccf0e2778c9 +SHA512 (openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz) = eea5d4e6eeb3b915277d0b82d3d11c2cb5018ea68f4c37eaba838acfa059f6b4c8b5dfa3e1121862d5a73ebe125bd664627aebe70b8fc5706f3fcc653887f466