From 6b775ea62749d8514fcf1d4a9e5443d4928b464c Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Thu, 4 Dec 2025 15:01:39 +0800 Subject: [PATCH] Update code from upstream --- edk2-upstream-058cae8e.patch | 956 +++++++++++++++++++++++++++++++++++ edk2.spec | 9 +- 2 files changed, 963 insertions(+), 2 deletions(-) create mode 100644 edk2-upstream-058cae8e.patch diff --git a/edk2-upstream-058cae8e.patch b/edk2-upstream-058cae8e.patch new file mode 100644 index 0000000..4bd182e --- /dev/null +++ b/edk2-upstream-058cae8e.patch @@ -0,0 +1,956 @@ +--- a/0003-Remove-paths-leading-to-submodules.patch ++++ b/0003-Remove-paths-leading-to-submodules.patch +@@ -1,4 +1,4 @@ +-From 7e0fc3ba07d881b3cb91cdff2108182889161795 Mon Sep 17 00:00:00 2001 ++From 00c911e68115577cc1b47c892e5a5d9eebe376bc Mon Sep 17 00:00:00 2001 + From: Miroslav Rezanina + Date: Thu, 24 Mar 2022 03:23:02 -0400 + Subject: [PATCH] Remove paths leading to submodules +@@ -15,10 +15,10 @@ Signed-off-by: Miroslav Rezanina + 3 files changed, 9 deletions(-) + + diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile +-index 5275f657ef..39d7199753 100644 ++index 0ea314ef96..92d3dedf47 100644 + --- a/BaseTools/Source/C/GNUmakefile + +++ b/BaseTools/Source/C/GNUmakefile +-@@ -51,7 +51,6 @@ all: makerootdir subdirs ++@@ -24,7 +24,6 @@ all: makerootdir subdirs + LIBRARIES = Common + VFRAUTOGEN = VfrCompile/VfrLexer.h + APPLICATIONS = \ +@@ -27,7 +27,7 @@ index 5275f657ef..39d7199753 100644 + EfiRom \ + GenFfs \ + diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec +-index 3698caf902..5250d77ecc 100644 ++index 24cc64f6b4..71825947d0 100644 + --- a/MdeModulePkg/MdeModulePkg.dec + +++ b/MdeModulePkg/MdeModulePkg.dec + @@ -26,9 +26,6 @@ +@@ -41,7 +41,7 @@ index 3698caf902..5250d77ecc 100644 + ## @libraryclass Defines a set of methods to reset whole system. + ResetSystemLib|Include/Library/ResetSystemLib.h + diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec +-index 6a6ef01311..523c784ede 100644 ++index ed22a67568..0a2bfb5ec9 100644 + --- a/MdePkg/MdePkg.dec + +++ b/MdePkg/MdePkg.dec + @@ -30,7 +30,6 @@ + +--- a/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch ++++ b/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +@@ -1,4 +1,4 @@ +-From c530c3ada9b21af6ceecd381a5688a615d48b8a4 Mon Sep 17 00:00:00 2001 ++From 9037d5c6dbb18e6f7d9fb12ffcf2334930ba8a56 Mon Sep 17 00:00:00 2001 + From: Laszlo Ersek + Date: Tue, 25 Feb 2014 22:40:01 +0100 + Subject: [PATCH] MdeModulePkg: TerminalDxe: set xterm resolution on mode +@@ -104,10 +104,10 @@ Signed-off-by: Laszlo Ersek + 3 files changed, 36 insertions(+) + + diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec +-index 5250d77ecc..5a4808c267 100644 ++index 71825947d0..b511a5a6b3 100644 + --- a/MdeModulePkg/MdeModulePkg.dec + +++ b/MdeModulePkg/MdeModulePkg.dec +-@@ -2287,6 +2287,10 @@ ++@@ -2281,6 +2281,10 @@ + # @Prompt Conduit to use in ArmFfaLib. + gEfiMdeModulePkgTokenSpaceGuid.PcdFfaLibConduitSmc|TRUE|BOOLEAN|0x10000029 + + +--- a/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch ++++ b/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +@@ -1,4 +1,4 @@ +-From 90952108059a48921f76f61fe1cda5eef258be01 Mon Sep 17 00:00:00 2001 ++From aa889d023adfafd8c562302119c4ca6d377195b0 Mon Sep 17 00:00:00 2001 + From: Laszlo Ersek + Date: Wed, 14 Oct 2015 15:59:06 +0200 + Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH +@@ -83,10 +83,10 @@ Signed-off-by: Laszlo Ersek + 9 files changed, 21 insertions(+), 1 deletion(-) + + diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc +-index e99fb3bd95..b28f014dcd 100644 ++index 8e7e69da00..b18345f4a7 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.dsc + +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +-@@ -489,6 +489,7 @@ ++@@ -487,6 +487,7 @@ + [PcdsDynamicDefault] + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + +@@ -95,10 +95,10 @@ index e99fb3bd95..b28f014dcd 100644 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 + diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc +-index a4f6d1c10a..08a66f0d43 100644 ++index 157aa8e611..f6a80943ab 100644 + --- a/OvmfPkg/CloudHv/CloudHvX64.dsc + +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc +-@@ -603,6 +603,7 @@ ++@@ -601,6 +601,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + +@@ -107,10 +107,10 @@ index a4f6d1c10a..08a66f0d43 100644 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc +-index f1d070ca8c..a2201ec10b 100644 ++index 18fd116311..83772af284 100644 + --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc + +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc +-@@ -481,6 +481,7 @@ ++@@ -479,6 +479,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + +@@ -119,7 +119,7 @@ index f1d070ca8c..a2201ec10b 100644 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 + diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc +-index 8bd8b686b5..31c5ccda14 100644 ++index 884d5a9432..b56ca4e42f 100644 + --- a/OvmfPkg/Microvm/MicrovmX64.dsc + +++ b/OvmfPkg/Microvm/MicrovmX64.dsc + @@ -588,7 +588,7 @@ +@@ -132,10 +132,10 @@ index 8bd8b686b5..31c5ccda14 100644 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +-index fa73d355ea..cede7c2424 100644 ++index 550c54d321..6502464285 100644 + --- a/OvmfPkg/OvmfPkgIa32.dsc + +++ b/OvmfPkg/OvmfPkgIa32.dsc +-@@ -594,6 +594,7 @@ ++@@ -592,6 +592,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + +@@ -144,10 +144,10 @@ index fa73d355ea..cede7c2424 100644 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +-index 384bb310c3..89ed05431a 100644 ++index 06fc031ab4..aa40cdbadb 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.dsc + +++ b/OvmfPkg/OvmfPkgIa32X64.dsc +-@@ -605,6 +605,7 @@ ++@@ -619,6 +619,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + +@@ -156,10 +156,10 @@ index 384bb310c3..89ed05431a 100644 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +-index 60fccc19d2..8f8711f519 100644 ++index f859db6acd..5600a25954 100644 + --- a/OvmfPkg/OvmfPkgX64.dsc + +++ b/OvmfPkg/OvmfPkgX64.dsc +-@@ -632,6 +632,7 @@ ++@@ -697,6 +697,7 @@ + # ($(SMM_REQUIRE) == FALSE) + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 + +@@ -199,10 +199,10 @@ index a354e0641f..bb791fba71 100644 + + InstallClearCacheCallback (); + diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf +-index 1b2af6f3e6..d01575528e 100644 ++index 1f1616c569..a82c9a6490 100644 + --- a/OvmfPkg/PlatformPei/PlatformPei.inf + +++ b/OvmfPkg/PlatformPei/PlatformPei.inf +-@@ -107,6 +107,7 @@ ++@@ -108,6 +108,7 @@ + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved + +--- a/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch ++++ b/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +@@ -1,4 +1,4 @@ +-From ab6f73488ed3975ded7f979fc6b89fd0f920b8ee Mon Sep 17 00:00:00 2001 ++From cfb42ab82de9694d83deebe2957d4d1e46951d97 Mon Sep 17 00:00:00 2001 + From: Laszlo Ersek + Date: Sun, 26 Jul 2015 08:02:50 +0000 + Subject: [PATCH] ArmVirtPkg: take PcdResizeXterm from the QEMU command line +@@ -96,10 +96,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 7b26b5059e..da1f4040ab 100644 ++index 1e239bbbf7..738f1b1403 100644 + --- a/ArmVirtPkg/ArmVirtQemu.dsc + +++ b/ArmVirtPkg/ArmVirtQemu.dsc +-@@ -317,6 +317,8 @@ ++@@ -318,6 +318,8 @@ + gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0 + !endif + +@@ -108,7 +108,7 @@ index 7b26b5059e..da1f4040ab 100644 + [PcdsDynamicHii] + gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS + +-@@ -431,7 +433,10 @@ ++@@ -432,7 +434,10 @@ + MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf + MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf + MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf + +--- a/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch ++++ b/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +@@ -1,4 +1,4 @@ +-From d262d4f7794cdbf9fe2bba93cf0fcd67f4cb7995 Mon Sep 17 00:00:00 2001 ++From 6201ce5b2b6803d7c69fb1c757e9962d028524ad Mon Sep 17 00:00:00 2001 + From: Paolo Bonzini + Date: Tue, 21 Nov 2017 00:57:45 +0100 + Subject: [PATCH] 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 b28f014dcd..abe155e245 100644 ++index b18345f4a7..c7342f4f34 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.dsc + +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +-@@ -434,7 +434,7 @@ ++@@ -432,7 +432,7 @@ + # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may + # // significantly impact boot performance + # DEBUG_ERROR 0x80000000 // Error +@@ -78,10 +78,10 @@ index b28f014dcd..abe155e245 100644 + !if $(SOURCE_DEBUG_ENABLE) == TRUE + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +-index cede7c2424..3300b55588 100644 ++index 6502464285..0f2cc35529 100644 + --- a/OvmfPkg/OvmfPkgIa32.dsc + +++ b/OvmfPkg/OvmfPkgIa32.dsc +-@@ -530,7 +530,7 @@ ++@@ -528,7 +528,7 @@ + # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may + # // significantly impact boot performance + # DEBUG_ERROR 0x80000000 // Error +@@ -91,10 +91,10 @@ index cede7c2424..3300b55588 100644 + !if $(SOURCE_DEBUG_ENABLE) == TRUE + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +-index 89ed05431a..38473ef3c2 100644 ++index aa40cdbadb..3f3e3f0526 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.dsc + +++ b/OvmfPkg/OvmfPkgIa32X64.dsc +-@@ -536,7 +536,7 @@ ++@@ -550,7 +550,7 @@ + # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may + # // significantly impact boot performance + # DEBUG_ERROR 0x80000000 // Error +@@ -104,10 +104,10 @@ index 89ed05431a..38473ef3c2 100644 + !if $(SOURCE_DEBUG_ENABLE) == TRUE + gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +-index 8f8711f519..676f984631 100644 ++index 5600a25954..e8d1c48ca1 100644 + --- a/OvmfPkg/OvmfPkgX64.dsc + +++ b/OvmfPkg/OvmfPkgX64.dsc +-@@ -564,7 +564,7 @@ ++@@ -629,7 +629,7 @@ + # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may + # // significantly impact boot performance + # DEBUG_ERROR 0x80000000 // Error + +--- a/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch ++++ b/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +@@ -1,4 +1,4 @@ +-From c087bac4d8596a1712b16713d07f240b1f2d1bf9 Mon Sep 17 00:00:00 2001 ++From a746987ffec6322426fe28c93305d83c8645e0ec Mon Sep 17 00:00:00 2001 + From: Paolo Bonzini + Date: Tue, 21 Nov 2017 00:57:46 +0100 + Subject: [PATCH] OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in +@@ -86,10 +86,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 abe155e245..242ee35b80 100644 ++index c7342f4f34..b4fb1554e7 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.dsc + +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +-@@ -694,8 +694,14 @@ ++@@ -683,8 +683,14 @@ + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + +@@ -107,10 +107,10 @@ index abe155e245..242ee35b80 100644 + + # + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +-index 3300b55588..308fea90a6 100644 ++index 0f2cc35529..9e3f9673cf 100644 + --- a/OvmfPkg/OvmfPkgIa32.dsc + +++ b/OvmfPkg/OvmfPkgIa32.dsc +-@@ -819,8 +819,14 @@ ++@@ -808,8 +808,14 @@ + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + +@@ -128,10 +128,10 @@ index 3300b55588..308fea90a6 100644 + OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf + + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +-index 38473ef3c2..fcdebb2c0a 100644 ++index 3f3e3f0526..c9a19b8e58 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.dsc + +++ b/OvmfPkg/OvmfPkgIa32X64.dsc +-@@ -833,8 +833,14 @@ ++@@ -847,8 +847,14 @@ + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + +@@ -149,10 +149,10 @@ index 38473ef3c2..fcdebb2c0a 100644 + OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf + + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +-index 676f984631..c7cdd0b539 100644 ++index e8d1c48ca1..cb1ad574c2 100644 + --- a/OvmfPkg/OvmfPkgX64.dsc + +++ b/OvmfPkg/OvmfPkgX64.dsc +-@@ -914,8 +914,14 @@ ++@@ -979,8 +979,14 @@ + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + + +--- a/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch ++++ b/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +@@ -1,4 +1,4 @@ +-From 21f45d5799cc6ce28177a92f6007542570e54fe7 Mon Sep 17 00:00:00 2001 ++From 1cd95a1d3d7de8efb2b1673fcc3d3cb1ff84967a Mon Sep 17 00:00:00 2001 + From: Laszlo Ersek + Date: Wed, 27 Jan 2016 03:05:18 +0100 + Subject: [PATCH] ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in +@@ -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 da1f4040ab..5f0fc7cdd0 100644 ++index 738f1b1403..d14888508d 100644 + --- a/ArmVirtPkg/ArmVirtQemu.dsc + +++ b/ArmVirtPkg/ArmVirtQemu.dsc +-@@ -558,7 +558,10 @@ ++@@ -559,7 +559,10 @@ + # + # Video support + # +@@ -77,7 +77,7 @@ index da1f4040ab..5f0fc7cdd0 100644 + OvmfPkg/PlatformDxe/Platform.inf + + diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc +-index 49bd99346a..68400ac66c 100644 ++index eee9590a7e..eb9f4b9fca 100644 + --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc + +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc + @@ -467,7 +467,10 @@ + +--- a/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch ++++ b/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +@@ -1,4 +1,4 @@ +-From 039505f6002865c8a2cd5b7cf589c18264813140 Mon Sep 17 00:00:00 2001 ++From ad73ab2cd9fe347c2d857364b0cc6a76202b610f Mon Sep 17 00:00:00 2001 + From: Philippe Mathieu-Daude + Date: Thu, 1 Aug 2019 20:43:48 +0200 + Subject: [PATCH] OvmfPkg: QemuRamfbDxe: Do not report DXE failure on Aarch64 + +--- a/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch ++++ b/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +@@ -1,4 +1,4 @@ +-From c140b333c5b73104c6224b7adc540bd9d7a0bbeb Mon Sep 17 00:00:00 2001 ++From f6997042745a9d1594d5f8d1bbabd4c256b437af Mon Sep 17 00:00:00 2001 + From: Paolo Bonzini + Date: Tue, 21 Nov 2017 00:57:47 +0100 + Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe +@@ -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 242ee35b80..52bd587f1b 100644 ++index b4fb1554e7..97f595b38a 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.dsc + +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +-@@ -689,7 +689,10 @@ ++@@ -678,7 +678,10 @@ + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf + MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf +@@ -79,10 +79,10 @@ index 242ee35b80..52bd587f1b 100644 + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +-index 308fea90a6..691d7fab14 100644 ++index 9e3f9673cf..ae18ef3ad1 100644 + --- a/OvmfPkg/OvmfPkgIa32.dsc + +++ b/OvmfPkg/OvmfPkgIa32.dsc +-@@ -814,7 +814,10 @@ ++@@ -803,7 +803,10 @@ + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf + MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf +@@ -95,10 +95,10 @@ index 308fea90a6..691d7fab14 100644 + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +-index fcdebb2c0a..1f079baf7a 100644 ++index c9a19b8e58..4d9f28743e 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.dsc + +++ b/OvmfPkg/OvmfPkgIa32X64.dsc +-@@ -828,7 +828,10 @@ ++@@ -842,7 +842,10 @@ + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf + MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf +@@ -111,10 +111,10 @@ index fcdebb2c0a..1f079baf7a 100644 + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +-index c7cdd0b539..26f86230b4 100644 ++index cb1ad574c2..dbb973cd13 100644 + --- a/OvmfPkg/OvmfPkgX64.dsc + +++ b/OvmfPkg/OvmfPkgX64.dsc +-@@ -909,7 +909,10 @@ ++@@ -974,7 +974,10 @@ + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf + MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf + +--- a/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch ++++ b/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +@@ -1,4 +1,4 @@ +-From f910836bc0c2c10c4bd8bc8ff3ee028bcfc986f1 Mon Sep 17 00:00:00 2001 ++From aeebf10a86cc381a49083992eda48b8333df668f Mon Sep 17 00:00:00 2001 + From: Laszlo Ersek + Date: Wed, 24 Jun 2020 11:31:36 +0200 + Subject: [PATCH] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" + +--- a/0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch ++++ b/0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +@@ -1,4 +1,4 @@ +-From 956ea6ccb8bbf96e262d25c80d658ad024a3ad6a Mon Sep 17 00:00:00 2001 ++From 7997189087f6b062893f89c21dbe20eaa0159519 Mon Sep 17 00:00:00 2001 + From: Laszlo Ersek + Date: Wed, 24 Jun 2020 11:40:09 +0200 + Subject: [PATCH] SecurityPkg/Tcg2Dxe: suppress error on no swtpm in silent +@@ -31,7 +31,7 @@ Signed-off-by: Miroslav Rezanina + 2 files changed, 18 insertions(+) + + diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +-index 4d0c241f4d..e228d5f39f 100644 ++index 85a852842d..179c1499d3 100644 + --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c + +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c + @@ -29,6 +29,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent +@@ -42,7 +42,7 @@ index 4d0c241f4d..e228d5f39f 100644 + #include + #include + #include +-@@ -2754,6 +2755,22 @@ DriverEntry ( ++@@ -2753,6 +2754,22 @@ DriverEntry ( + CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)) + { + DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); + +--- a/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch ++++ b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +@@ -1,4 +1,4 @@ +-From 1f39b58478c7a02bdd0b446a7bd417d55058b0d2 Mon Sep 17 00:00:00 2001 ++From a5b492864ac47e1e08a8bde2972952fb47b83b24 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: [PATCH] OvmfPkg: Remove EbcDxe (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 52bd587f1b..92a7b1b03d 100644 ++index 97f595b38a..06b8bf7275 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.dsc + +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +-@@ -614,7 +614,6 @@ ++@@ -612,7 +612,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc + } + +@@ -41,7 +41,7 @@ index 52bd587f1b..92a7b1b03d 100644 + UefiCpuPkg/CpuDxe/CpuDxe.inf + OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +-index 46e20745fe..950705523a 100644 ++index 89b49ea768..7750c0fbe5 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.fdf + +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf + @@ -212,7 +212,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -53,10 +53,10 @@ index 46e20745fe..950705523a 100644 + INF UefiCpuPkg/CpuDxe/CpuDxe.inf + INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +-index 691d7fab14..9989e1144d 100644 ++index ae18ef3ad1..c5c5b4d5c2 100644 + --- a/OvmfPkg/OvmfPkgIa32.dsc + +++ b/OvmfPkg/OvmfPkgIa32.dsc +-@@ -737,7 +737,6 @@ ++@@ -735,7 +735,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc + } + +@@ -65,7 +65,7 @@ index 691d7fab14..9989e1144d 100644 + UefiCpuPkg/CpuDxe/CpuDxe.inf + OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +-index d6abacc03b..58be8db2c8 100644 ++index ea693bf4a0..e4098005be 100644 + --- a/OvmfPkg/OvmfPkgIa32.fdf + +++ b/OvmfPkg/OvmfPkgIa32.fdf + @@ -216,7 +216,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf +@@ -77,10 +77,10 @@ index d6abacc03b..58be8db2c8 100644 + INF UefiCpuPkg/CpuDxe/CpuDxe.inf + INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +-index 1f079baf7a..8e38b5d15d 100644 ++index 4d9f28743e..74000e1c28 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.dsc + +++ b/OvmfPkg/OvmfPkgIa32X64.dsc +-@@ -750,7 +750,6 @@ ++@@ -770,7 +770,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc + } + +@@ -89,10 +89,10 @@ index 1f079baf7a..8e38b5d15d 100644 + UefiCpuPkg/CpuDxe/CpuDxe.inf + OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +-index 2ad26713f6..6b4d826df9 100644 ++index 081faa5ee6..0d04e23c78 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.fdf + +++ b/OvmfPkg/OvmfPkgIa32X64.fdf +-@@ -217,7 +217,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf ++@@ -226,7 +226,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf + + INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf + INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf +@@ -101,10 +101,10 @@ index 2ad26713f6..6b4d826df9 100644 + INF UefiCpuPkg/CpuDxe/CpuDxe.inf + INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +-index 26f86230b4..c8eb31fa31 100644 ++index dbb973cd13..0d68f4064d 100644 + --- a/OvmfPkg/OvmfPkgX64.dsc + +++ b/OvmfPkg/OvmfPkgX64.dsc +-@@ -808,7 +808,6 @@ ++@@ -879,7 +879,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc + } + +@@ -113,10 +113,10 @@ index 26f86230b4..c8eb31fa31 100644 + + UefiCpuPkg/CpuDxe/CpuDxe.inf { + diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +-index 06ae0cafc1..3d28d7754d 100644 ++index b332d3bb8e..f081a28179 100644 + --- a/OvmfPkg/OvmfPkgX64.fdf + +++ b/OvmfPkg/OvmfPkgX64.fdf +-@@ -248,7 +248,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf ++@@ -257,7 +257,6 @@ INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf + + INF MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf + INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf + +--- a/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch ++++ b/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch +@@ -1,4 +1,4 @@ +-From b3dc6cb66bc6fd53f73c7a1259a29a5f051a2d3e Mon Sep 17 00:00:00 2001 ++From c5772ea42b123c9dc3233b578ae5453ed1a8c5ba 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: [PATCH] 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 92a7b1b03d..d0b80948b4 100644 ++index 06b8bf7275..6efc896439 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.dsc + +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +-@@ -704,7 +704,6 @@ ++@@ -693,7 +693,6 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } +@@ -41,10 +41,10 @@ index 92a7b1b03d..d0b80948b4 100644 + # + # ISA Support + diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +-index 950705523a..f0c2ae52e5 100644 ++index 7750c0fbe5..c0468cf4d1 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.fdf + +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +-@@ -300,7 +300,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf ++@@ -291,7 +291,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + + INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +@@ -53,10 +53,10 @@ index 950705523a..f0c2ae52e5 100644 + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +-index 9989e1144d..5130e411ca 100644 ++index c5c5b4d5c2..694230cf88 100644 + --- a/OvmfPkg/OvmfPkgIa32.dsc + +++ b/OvmfPkg/OvmfPkgIa32.dsc +-@@ -829,7 +829,6 @@ ++@@ -818,7 +818,6 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } +@@ -65,10 +65,10 @@ index 9989e1144d..5130e411ca 100644 + + # + diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +-index 58be8db2c8..0e3fd507b0 100644 ++index e4098005be..4017260b9e 100644 + --- a/OvmfPkg/OvmfPkgIa32.fdf + +++ b/OvmfPkg/OvmfPkgIa32.fdf +-@@ -317,7 +317,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf ++@@ -308,7 +308,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +@@ -77,10 +77,10 @@ index 58be8db2c8..0e3fd507b0 100644 + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf + INF OvmfPkg/VirtHstiDxe/VirtHstiDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +-index 8e38b5d15d..e8fe3945a8 100644 ++index 74000e1c28..00a298b8d3 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.dsc + +++ b/OvmfPkg/OvmfPkgIa32X64.dsc +-@@ -843,7 +843,6 @@ ++@@ -857,7 +857,6 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } +@@ -89,7 +89,7 @@ index 8e38b5d15d..e8fe3945a8 100644 + + # + diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +-index 6b4d826df9..4029025276 100644 ++index 0d04e23c78..6e525fc76e 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.fdf + +++ b/OvmfPkg/OvmfPkgIa32X64.fdf + @@ -324,7 +324,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf +@@ -101,10 +101,10 @@ index 6b4d826df9..4029025276 100644 + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +-index c8eb31fa31..f04cd47fdd 100644 ++index 0d68f4064d..3d734421af 100644 + --- a/OvmfPkg/OvmfPkgX64.dsc + +++ b/OvmfPkg/OvmfPkgX64.dsc +-@@ -924,7 +924,6 @@ ++@@ -989,7 +989,6 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } +@@ -113,10 +113,10 @@ index c8eb31fa31..f04cd47fdd 100644 + + # + diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +-index 3d28d7754d..f0c944b9be 100644 ++index f081a28179..2a0b192b24 100644 + --- a/OvmfPkg/OvmfPkgX64.fdf + +++ b/OvmfPkg/OvmfPkgX64.fdf +-@@ -360,7 +360,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf ++@@ -362,7 +362,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + +--- a/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch ++++ b/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +@@ -1,4 +1,4 @@ +-From 379210ab23502c6934f21da21befd8a9757d192f Mon Sep 17 00:00:00 2001 ++From 1087f1f600f1fc8eb8ffd484acb6d13cfccba969 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: [PATCH] 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 5130e411ca..5997f26c80 100644 ++index 694230cf88..0b7d1cb48e 100644 + --- a/OvmfPkg/OvmfPkgIa32.dsc + +++ b/OvmfPkg/OvmfPkgIa32.dsc +-@@ -807,7 +807,6 @@ ++@@ -796,7 +796,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +@@ -39,10 +39,10 @@ index 5130e411ca..5997f26c80 100644 + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +-index 0e3fd507b0..9c5c979456 100644 ++index 4017260b9e..80ee28444f 100644 + --- a/OvmfPkg/OvmfPkgIa32.fdf + +++ b/OvmfPkg/OvmfPkgIa32.fdf +-@@ -290,7 +290,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour ++@@ -281,7 +281,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + + INF FatPkg/EnhancedFatDxe/Fat.inf + INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +@@ -51,10 +51,10 @@ index 0e3fd507b0..9c5c979456 100644 + INF MdeModulePkg/Logo/LogoDxe.inf + + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +-index e8fe3945a8..ffae791a12 100644 ++index 00a298b8d3..0df428fab0 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.dsc + +++ b/OvmfPkg/OvmfPkgIa32X64.dsc +-@@ -821,7 +821,6 @@ ++@@ -835,7 +835,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +@@ -63,7 +63,7 @@ index e8fe3945a8..ffae791a12 100644 + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +-index 4029025276..5aa583ae22 100644 ++index 6e525fc76e..962f17d236 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.fdf + +++ b/OvmfPkg/OvmfPkgIa32X64.fdf + @@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour +@@ -75,10 +75,10 @@ index 4029025276..5aa583ae22 100644 + INF MdeModulePkg/Logo/LogoDxe.inf + + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +-index f04cd47fdd..c3da7ab913 100644 ++index 3d734421af..ed35b15fe2 100644 + --- a/OvmfPkg/OvmfPkgX64.dsc + +++ b/OvmfPkg/OvmfPkgX64.dsc +-@@ -902,7 +902,6 @@ ++@@ -967,7 +967,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +@@ -87,10 +87,10 @@ index f04cd47fdd..c3da7ab913 100644 + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +-index f0c944b9be..a746d4807c 100644 ++index 2a0b192b24..8c592f5f9e 100644 + --- a/OvmfPkg/OvmfPkgX64.fdf + +++ b/OvmfPkg/OvmfPkgX64.fdf +-@@ -326,7 +326,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour ++@@ -328,7 +328,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + + INF FatPkg/EnhancedFatDxe/Fat.inf + INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + +--- a/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch ++++ b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +@@ -1,4 +1,4 @@ +-From 92095eb018e9f93593121b51eadacb40b1f94218 Mon Sep 17 00:00:00 2001 ++From 1abfbfc7e4bef8346a9b71384f173b2b300c37da 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: [PATCH] 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 5f0fc7cdd0..2618699c00 100644 ++index d14888508d..5630bf79d6 100644 + --- a/ArmVirtPkg/ArmVirtQemu.dsc + +++ b/ArmVirtPkg/ArmVirtQemu.dsc +-@@ -486,7 +486,6 @@ ++@@ -487,7 +487,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +@@ -48,7 +48,7 @@ index e25d6bbe07..6b444be30c 100644 + # + # Status Code Routing + diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc +-index 68400ac66c..abfe5ed9b6 100644 ++index eb9f4b9fca..281eb0680c 100644 + --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc + +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc + @@ -395,7 +395,6 @@ + +--- a/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch ++++ b/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +@@ -1,4 +1,4 @@ +-From ae5af20d14e1cb44b5a844cb569c7cc86a01c8c5 Mon Sep 17 00:00:00 2001 ++From d5438203ad4c36f4a5e573950d2741de3aff731a 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: [PATCH] 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 d0b80948b4..c49949f991 100644 ++index 6efc896439..717956cfc9 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.dsc + +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +-@@ -682,7 +682,6 @@ ++@@ -671,7 +671,6 @@ + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +@@ -41,10 +41,10 @@ index d0b80948b4..c49949f991 100644 + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +-index f0c2ae52e5..45b97452b2 100644 ++index c0468cf4d1..b8f32fe002 100644 + --- a/OvmfPkg/AmdSev/AmdSevX64.fdf + +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +-@@ -280,7 +280,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf ++@@ -271,7 +271,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf + INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf + + INF FatPkg/EnhancedFatDxe/Fat.inf +@@ -53,10 +53,10 @@ index f0c2ae52e5..45b97452b2 100644 + INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf + INF OvmfPkg/AmdSev/Grub/Grub.inf + diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +-index 5997f26c80..5724461494 100644 ++index 0b7d1cb48e..7e4b7a50a2 100644 + --- a/OvmfPkg/OvmfPkgIa32.dsc + +++ b/OvmfPkg/OvmfPkgIa32.dsc +-@@ -806,7 +806,6 @@ ++@@ -795,7 +795,6 @@ + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +@@ -65,10 +65,10 @@ index 5997f26c80..5724461494 100644 + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +-index 9c5c979456..6159a58c62 100644 ++index 80ee28444f..6356996018 100644 + --- a/OvmfPkg/OvmfPkgIa32.fdf + +++ b/OvmfPkg/OvmfPkgIa32.fdf +-@@ -289,7 +289,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf ++@@ -280,7 +280,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 9c5c979456..6159a58c62 100644 + INF MdeModulePkg/Logo/LogoDxe.inf + + diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +-index ffae791a12..f2318ae8a4 100644 ++index 0df428fab0..a32264227a 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.dsc + +++ b/OvmfPkg/OvmfPkgIa32X64.dsc +-@@ -820,7 +820,6 @@ ++@@ -834,7 +834,6 @@ + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +@@ -89,7 +89,7 @@ index ffae791a12..f2318ae8a4 100644 + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +-index 5aa583ae22..c6b056d84d 100644 ++index 962f17d236..5db0e7c837 100644 + --- a/OvmfPkg/OvmfPkgIa32X64.fdf + +++ b/OvmfPkg/OvmfPkgIa32X64.fdf + @@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf +@@ -101,10 +101,10 @@ index 5aa583ae22..c6b056d84d 100644 + INF MdeModulePkg/Logo/LogoDxe.inf + + diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +-index c3da7ab913..b71a0ad76c 100644 ++index ed35b15fe2..3694dbc2b5 100644 + --- a/OvmfPkg/OvmfPkgX64.dsc + +++ b/OvmfPkg/OvmfPkgX64.dsc +-@@ -901,7 +901,6 @@ ++@@ -966,7 +966,6 @@ + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +@@ -113,10 +113,10 @@ index c3da7ab913..b71a0ad76c 100644 + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf + diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +-index a746d4807c..67d8003799 100644 ++index 8c592f5f9e..67121bc684 100644 + --- a/OvmfPkg/OvmfPkgX64.fdf + +++ b/OvmfPkg/OvmfPkgX64.fdf +-@@ -325,7 +325,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf ++@@ -327,7 +327,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf + INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf + + INF FatPkg/EnhancedFatDxe/Fat.inf + +--- a/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch ++++ b/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +@@ -1,4 +1,4 @@ +-From afe426e30067eb4c33f78d508662d0fe11fb81ed Mon Sep 17 00:00:00 2001 ++From a6bfbbfeeae914d6ec58ab7ab84e3358d403d264 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: [PATCH] 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 2618699c00..2c2480f369 100644 ++index 5630bf79d6..ae021fad54 100644 + --- a/ArmVirtPkg/ArmVirtQemu.dsc + +++ b/ArmVirtPkg/ArmVirtQemu.dsc +-@@ -485,7 +485,6 @@ ++@@ -486,7 +486,6 @@ + MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +@@ -48,7 +48,7 @@ index 6b444be30c..e487e15eb1 100644 + # + # Status Code Routing + diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc +-index abfe5ed9b6..f1199ddb19 100644 ++index 281eb0680c..9a746ba75d 100644 + --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc + +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc + @@ -394,7 +394,6 @@ + +--- a/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch ++++ b/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +@@ -1,4 +1,4 @@ +-From fe71b5e20423c16f35abfbb0c2ac3c7b96136cc8 Mon Sep 17 00:00:00 2001 ++From 0a76a4f4a131e7e5432d8477647b3da327d7304d 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: [PATCH] OvmfPkg: Remove TftpDynamicCommand from shell (RHEL only) + +--- a/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch ++++ b/0021-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +@@ -1,4 +1,4 @@ +-From 3b489c30495c4dd2da0b98925b2135d8bbfff382 Mon Sep 17 00:00:00 2001 ++From e90dc4acad3bc00a08af2f0bb8a5685dc0225fd8 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: [PATCH] OvmfPkg: Remove HttpDynamicCommand from shell (RHEL only) + +--- a/0022-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch ++++ b/0022-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +@@ -1,4 +1,4 @@ +-From e4b6df7af85a0c96e0e1c383124cafad6bf45b7f Mon Sep 17 00:00:00 2001 ++From d430e75930ddf9532611d26509ea65bc921adc44 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: [PATCH] OvmfPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only) + diff --git a/edk2.spec b/edk2.spec index d3c80dc..027e070 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,4 +1,4 @@ -%define anolis_release 19 +%define anolis_release 1 %undefine _auto_set_build_flags ExclusiveArch: x86_64 aarch64 loongarch64 riscv64 @@ -30,7 +30,7 @@ ExclusiveArch: x86_64 aarch64 loongarch64 riscv64 Name: edk2 -Version: 202402 +Version: 20250822 Release: %{anolis_release}%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT @@ -112,6 +112,7 @@ Patch1006: 1006-MdePkg-Fix-overflow-issue-in-BasePeC.patch Patch1008: 1008-CVE-2024-1298.patch # https://github.com/tianocore/edk2/pull/10928 Patch1009: 1009-CVE-2024-38797.patch +Patch1010: edk2-upstream-058cae8e.patch BuildRequires: python3-devel BuildRequires: libuuid-devel @@ -564,6 +565,10 @@ rm -f %{buildroot}%{_datadir}/edk2/riscv/*.raw %changelog +* Thu Dec 04 2025 Upstream Sync - 20250822-%{anolis_release} +- Sync upstream changes from commit unknown +- Applied upstream updates + * Tue Sep 23 2025 wh02252983 - 202402-19 - openssl update to 3.0.14 to fix CVE-2024-0727 -- Gitee