From 8a2fa30d59ecebf2bced4ab907d522aa095a1f81 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Tue, 2 Apr 2024 04:22:40 -0400 Subject: [PATCH] * Tue Apr 02 2024 Miroslav Rezanina - 20240214-1 - Imported edk2-202402 from RHEL 9 - Resolves: RHEL-30180 --- ...-do-not-build-BrotliCompress-RH-only.patch | 43 -- ...ove-package-private-Brotli-include-p.patch | 50 -- 0003-Remove-paths-leading-to-submodules.patch | 65 +++ ...minalDxe-set-xterm-resolution-on-mod.patch | 140 ++--- ...ResizeXterm-from-the-QEMU-command-li.patch | 115 ++-- ...PcdResizeXterm-from-the-QEMU-command.patch | 179 +++--- ...mfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch | 25 +- ...DEBUG_VERBOSE-0x00400000-in-QemuVide.patch | 66 ++- ...ce-DEBUG_VERBOSE-0x00400000-in-QemuR.patch | 31 +- ...bDxe-Do-not-report-DXE-failure-on-Aa.patch | 70 ++- ...EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch | 33 +- ...elLoaderFsDxe-suppress-error-on-no-k.patch | 78 ++- ...Dxe-suppress-error-on-no-swtpm-in-si.patch | 71 ++- 0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch | 126 +++++ ...ve-VirtioGpu-device-driver-RHEL-only.patch | 126 +++++ ...irtioFsDxe-filesystem-driver-RHEL-on.patch | 100 ++++ ...e-VirtioFsDxe-filesystem-driver-RHEL.patch | 61 ++ ...ariableStoreSize-PcdMaxVolatileVaria.patch | 100 ---- ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 126 +++++ ...LOAD-segment-with-RWX-permissions-wa.patch | 26 - ...mory-attributes-protocol-to-be-disab.patch | 182 ------ ...e-UdfDxe-filesystem-driver-RHEL-only.patch | 61 ++ ...ftpDynamicCommand-from-shell-RHEL-on.patch | 109 ++++ ...e-TftpDynamicCommand-from-shell-RHEL.patch | 54 ++ ...ttpDynamicCommand-from-shell-RHEL-on.patch | 113 ++++ ...e-HttpDynamicCommand-from-shell-RHEL.patch | 55 ++ ...inuxInitrdDynamicShellCommand-RHEL-o.patch | 147 +++++ ...e-LinuxInitrdDynamicShellCommand-RHE.patch | 66 +++ ...nitLib-fix-apic-mode-for-cpu-hotplug.patch | 23 +- ...Dxe-Shim-Reboot-workaround-RHEL-only.patch | 121 ++++ ...toPkg-CrtLib-add-stat.h-include-file.patch | 13 +- ...-add-access-open-read-write-close-sy.patch | 133 ++--- ...Setup-MTRR-early-in-the-boot-process.patch | 194 +++++++ ...uralMsr.h-add-defines-for-MTRR-cache.patch | 41 ++ ...ib.h-use-cache-type-defines-from-Arc.patch | 70 +++ ...cache-type-defines-from-Architectura.patch | 49 ++ 30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json | 36 -- 30-edk2-ovmf-ia32-sb-enrolled.json | 36 -- ....json => 30-edk2-ovmf-x64-sb-enrolled.json | 2 +- 40-edk2-ovmf-4m-qcow2-x64-sb.json | 35 -- 40-edk2-ovmf-ia32-sb.json | 35 -- ...aw-x64-sb.json => 40-edk2-ovmf-x64-sb.json | 2 +- 50-edk2-aarch64-qcow2.json | 2 +- 50-edk2-arm-verbose.json | 32 -- 50-edk2-ovmf-4m-qcow2-x64-nosb.json | 36 -- 50-edk2-ovmf-ia32-nosb.json | 34 -- 50-edk2-ovmf-x64-microvm.json | 22 - ...64-nosb.json => 50-edk2-ovmf-x64-nosb.json | 3 +- 50-edk2-riscv-qcow2.json | 33 -- 51-edk2-aarch64-raw.json | 2 +- 52-edk2-aarch64-verbose-qcow2.json | 2 +- 53-edk2-aarch64-verbose-raw.json | 2 +- DBXUpdate-20220812.ia32.bin | Bin 6002 -> 0 bytes DBXUpdate-20220812.x64.bin | Bin 13778 -> 0 bytes DBXUpdate-20230314.ia32.bin | Bin 6098 -> 0 bytes DBXUpdate-20230314.x64.bin | Bin 13922 -> 0 bytes DBXUpdate-20230509.ia32.bin | Bin 7634 -> 0 bytes DBXUpdate-20230509.x64.bin | Bin 21170 -> 0 bytes README.experimental | 36 -- changelog | 369 ------------ edk2-build.fedora | 312 ---------- edk2-build.fedora.platforms | 47 -- edk2.spec | 534 +++--------------- make-tarball.sh | 24 - sources | 8 +- 65 files changed, 2261 insertions(+), 2445 deletions(-) delete mode 100644 0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch delete mode 100644 0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch create mode 100644 0003-Remove-paths-leading-to-submodules.patch rename 0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch => 0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch (82%) rename 0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch => 0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch (87%) rename 0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch => 0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch (94%) rename 0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch => 0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch (90%) rename 0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch => 0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch (86%) rename 0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch => 0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch (91%) rename 0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch => 0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch (85%) rename 0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch => 0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch (90%) rename 0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch => 0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch (82%) rename 0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch => 0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch (89%) create mode 100644 0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch create mode 100644 0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch create mode 100644 0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch create mode 100644 0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch delete mode 100644 0017-OvmfPkg-set-PcdVariableStoreSize-PcdMaxVolatileVaria.patch create mode 100644 0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch delete mode 100644 0018-silence-.-has-a-LOAD-segment-with-RWX-permissions-wa.patch delete mode 100644 0019-ArmVirt-Allow-memory-attributes-protocol-to-be-disab.patch create mode 100644 0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch create mode 100644 0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch create mode 100644 0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch create mode 100644 0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch create mode 100644 0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch create mode 100644 0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch create mode 100644 0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch rename 0013-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch => 0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch (67%) create mode 100644 0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch rename 0015-CryptoPkg-CrtLib-add-stat.h.patch => 0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch (72%) rename 0016-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch => 0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch (78%) create mode 100644 0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch create mode 100644 0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch create mode 100644 0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch create mode 100644 0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch delete mode 100644 30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json delete mode 100644 30-edk2-ovmf-ia32-sb-enrolled.json rename 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json => 30-edk2-ovmf-x64-sb-enrolled.json (96%) delete mode 100644 40-edk2-ovmf-4m-qcow2-x64-sb.json delete mode 100644 40-edk2-ovmf-ia32-sb.json rename 41-edk2-ovmf-2m-raw-x64-sb.json => 40-edk2-ovmf-x64-sb.json (96%) delete mode 100644 50-edk2-arm-verbose.json delete mode 100644 50-edk2-ovmf-4m-qcow2-x64-nosb.json delete mode 100644 50-edk2-ovmf-ia32-nosb.json delete mode 100644 50-edk2-ovmf-x64-microvm.json rename 51-edk2-ovmf-2m-raw-x64-nosb.json => 50-edk2-ovmf-x64-nosb.json (92%) delete mode 100644 50-edk2-riscv-qcow2.json delete mode 100644 DBXUpdate-20220812.ia32.bin delete mode 100644 DBXUpdate-20220812.x64.bin delete mode 100644 DBXUpdate-20230314.ia32.bin delete mode 100644 DBXUpdate-20230314.x64.bin delete mode 100644 DBXUpdate-20230509.ia32.bin delete mode 100644 DBXUpdate-20230509.x64.bin delete mode 100644 README.experimental delete mode 100644 changelog delete mode 100644 edk2-build.fedora delete mode 100644 edk2-build.fedora.platforms delete mode 100755 make-tarball.sh diff --git a/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch b/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch deleted file mode 100644 index 32a47fd..0000000 --- a/0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch +++ /dev/null @@ -1,43 +0,0 @@ -From bdb3ed312b939fc5f0c7b9b56c2395dada7c689c Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 4 Jun 2020 13:34:12 +0200 -Subject: [PATCH 01/14] BaseTools: do not build BrotliCompress (RH only) - -Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> -RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: - -- no change - -Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] -> -RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase: - -- New patch. - -BrotliCompress is not used for building ArmVirtPkg or OvmfPkg platforms. -It depends on one of the upstream Brotli git submodules that we removed -earlier in this rebase series. (See patch "remove upstream edk2's Brotli -submodules (RH only"). - -Do not attempt to build BrotliCompress. - -Signed-off-by: Laszlo Ersek -(cherry picked from commit db8ccca337e2c5722c1d408d2541cf653d3371a2) ---- - BaseTools/Source/C/GNUmakefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile -index 5275f657efe8..39d719975309 100644 ---- a/BaseTools/Source/C/GNUmakefile -+++ b/BaseTools/Source/C/GNUmakefile -@@ -51,7 +51,6 @@ all: makerootdir subdirs - LIBRARIES = Common - VFRAUTOGEN = VfrCompile/VfrLexer.h - APPLICATIONS = \ -- BrotliCompress \ - VfrCompile \ - EfiRom \ - GenFfs \ --- -2.41.0 - diff --git a/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch b/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch deleted file mode 100644 index 54c66a0..0000000 --- a/0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d42cd3199b6a33ec9811e5cc42a6ef0647d6a597 Mon Sep 17 00:00:00 2001 -From: Laszlo Ersek -Date: Thu, 4 Jun 2020 13:39:08 +0200 -Subject: [PATCH 02/14] MdeModulePkg: remove package-private Brotli include - path (RH only) - -Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> -RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: - -- no change - -Notes about the RHEL-8.2/20190904-37eef91017ad [edk2-stable201908] -> -RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] rebase: - -- New patch. - -Originating from upstream commit 58802e02c41b -("MdeModulePkg/BrotliCustomDecompressLib: Make brotli a submodule", -2020-04-16), "MdeModulePkg/MdeModulePkg.dec" contains a package-internal -include path into a Brotli submodule. - -The edk2 build system requires such include paths to resolve successfully, -regardless of the firmware platform being built. Because -BrotliCustomDecompressLib is not consumed by any OvmfPkg or ArmVirtPkg -platforms, and we've removed the submodule earlier in this patch set, -remove the include path too. - -Signed-off-by: Laszlo Ersek -(cherry picked from commit e05e0de713c4a2b8adb6ff9809611f222bfe50ed) ---- - MdeModulePkg/MdeModulePkg.dec | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 0ff058b0a9da..2f8e49f87bcc 100644 ---- a/MdeModulePkg/MdeModulePkg.dec -+++ b/MdeModulePkg/MdeModulePkg.dec -@@ -26,9 +26,6 @@ [Includes] - Include - Test/Mock/Include - --[Includes.Common.Private] -- Library/BrotliCustomDecompressLib/brotli/c/include -- - [LibraryClasses] - ## @libraryclass Defines a set of methods to reset whole system. - ResetSystemLib|Include/Library/ResetSystemLib.h --- -2.41.0 - diff --git a/0003-Remove-paths-leading-to-submodules.patch b/0003-Remove-paths-leading-to-submodules.patch new file mode 100644 index 0000000..2d8fcf4 --- /dev/null +++ b/0003-Remove-paths-leading-to-submodules.patch @@ -0,0 +1,65 @@ +From 3ab8a3e323e1bafb82266c0728e60a42d173764f 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 + +We removed submodules used upstream. However, edk2 build system requires +such include paths to resolve successfully, regardless of the firmware +platform being built. + +Signed-off-by: Miroslav Rezanina +--- + BaseTools/Source/C/GNUmakefile | 1 - + MdeModulePkg/MdeModulePkg.dec | 3 --- + MdePkg/MdePkg.dec | 5 ----- + 3 files changed, 9 deletions(-) + +diff --git a/BaseTools/Source/C/GNUmakefile b/BaseTools/Source/C/GNUmakefile +index 5275f657ef..39d7199753 100644 +--- a/BaseTools/Source/C/GNUmakefile ++++ b/BaseTools/Source/C/GNUmakefile +@@ -51,7 +51,6 @@ all: makerootdir subdirs + LIBRARIES = Common + VFRAUTOGEN = VfrCompile/VfrLexer.h + APPLICATIONS = \ +- BrotliCompress \ + VfrCompile \ + EfiRom \ + GenFfs \ +diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec +index a2cd83345f..98b3acb703 100644 +--- a/MdeModulePkg/MdeModulePkg.dec ++++ b/MdeModulePkg/MdeModulePkg.dec +@@ -26,9 +26,6 @@ + Include + Test/Mock/Include + +-[Includes.Common.Private] +- Library/BrotliCustomDecompressLib/brotli/c/include +- + [LibraryClasses] + ## @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 0459418906..bb347547f8 100644 +--- a/MdePkg/MdePkg.dec ++++ b/MdePkg/MdePkg.dec +@@ -29,7 +29,6 @@ + Include + Test/UnitTest/Include + Test/Mock/Include +- Library/MipiSysTLib/mipisyst/library/include + + [Includes.IA32] + Include/Ia32 +@@ -295,10 +294,6 @@ + # + FdtLib|Include/Library/FdtLib.h + +- ## @libraryclass Provides general mipi sys-T services. +- # +- MipiSysTLib|Include/Library/MipiSysTLib.h +- + ## @libraryclass Provides API to output Trace Hub debug message. + # + TraceHubDebugSysTLib|Include/Library/TraceHubDebugSysTLib.h diff --git a/0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch b/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch similarity index 82% rename from 0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch rename to 0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch index 9083e1b..e8b1f20 100644 --- a/0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +++ b/0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch @@ -1,9 +1,21 @@ -From e88e9ee342a168114a27c0fa09e807161bf54490 Mon Sep 17 00:00:00 2001 +From 1a8cccb3be265d0c423bbb42511b1d9111b076e0 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Tue, 25 Feb 2014 22:40:01 +0100 -Subject: [PATCH 03/14] MdeModulePkg: TerminalDxe: set xterm resolution on mode +Subject: [PATCH] MdeModulePkg: TerminalDxe: set xterm resolution on mode change (RH only) +Notes for rebase to edk2-stable202311: + +- Minor context changes due to new PCDs (for USB Networking) being added. + +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 + Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -82,99 +94,97 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit bc2266f20de5db1636e09a07e4a72c8dbf505f5a) --- MdeModulePkg/MdeModulePkg.dec | 4 +++ + .../Console/TerminalDxe/TerminalConOut.c | 30 +++++++++++++++++++ .../Console/TerminalDxe/TerminalDxe.inf | 2 ++ - .../Console/TerminalDxe/TerminalConOut.c | 29 +++++++++++++++++++ - 3 files changed, 35 insertions(+) + 3 files changed, 36 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec -index 2f8e49f87bcc..c1b10b38ef1d 100644 +index 98b3acb703..71a2967646 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec -@@ -2148,6 +2148,10 @@ [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx] +@@ -2164,6 +2164,10 @@ # @Prompt The value is use for Usb Network rate limiting supported. gEfiMdeModulePkgTokenSpaceGuid.PcdUsbNetworkRateLimitingFactor|100|UINT32|0x10000028 -+ ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal -+ # mode change. -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE|BOOLEAN|0x00010080 -+ ++ ## Controls whether TerminalDxe outputs an XTerm resize sequence on terminal ++ # mode change. ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE|BOOLEAN|0x00010080 ++ [PcdsPatchableInModule] ## Specify memory size with page number for PEI code when # Loading Module at Fixed Address feature is enabled. -diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -index b2a8aeba8510..eff625346539 100644 ---- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -@@ -55,6 +55,7 @@ [LibraryClasses] - DebugLib - PcdLib - BaseLib -+ PrintLib - - [Guids] - ## SOMETIMES_PRODUCES ## Variable:L"ConInDev" -@@ -87,6 +88,7 @@ [Protocols] - [Pcd] - gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType ## SOMETIMES_CONSUMES - gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## CONSUMES - - # [Event] - # # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout. diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c -index 7809869e7d49..496849458db4 100644 +index 7809869e7d..3be801039b 100644 --- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c +++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalConOut.c @@ -7,6 +7,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent **/ -+#include -+ ++#include ++ #include "Terminal.h" // -@@ -80,6 +82,15 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 +@@ -80,6 +82,16 @@ CHAR16 mSetCursorPositionString[] = { ESC, '[', '0', '0', ';', '0', '0', 'H', 0 CHAR16 mCursorForwardString[] = { ESC, '[', '0', '0', 'C', 0 }; CHAR16 mCursorBackwardString[] = { ESC, '[', '0', '0', 'D', 0 }; -+// -+// Note that this is an ASCII format string, taking two INT32 arguments: -+// rows, columns. -+// -+// A %d (INT32) format specification can expand to at most 11 characters. -+// -+CHAR8 mResizeTextAreaFormatString[] = "\x1B[8;%d;%dt"; -+#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2)) -+ ++// ++// Note that this is an ASCII format string, taking two INT32 arguments: ++// rows, columns. ++// ++// A %d (INT32) format specification can expand to at most 11 characters. ++// ++CHAR8 mResizeTextAreaFormatString[] = "\x1B[8;%d;%dt"; ++#define RESIZE_SEQ_SIZE (sizeof mResizeTextAreaFormatString + 2 * (11 - 2)) ++ ++ // // Body of the ConOut functions // -@@ -498,6 +509,24 @@ TerminalConOutSetMode ( +@@ -498,6 +510,24 @@ TerminalConOutSetMode ( return EFI_DEVICE_ERROR; } -+ if (PcdGetBool (PcdResizeXterm)) { -+ CHAR16 ResizeSequence[RESIZE_SEQ_SIZE]; -+ -+ UnicodeSPrintAsciiFormat ( -+ ResizeSequence, -+ sizeof ResizeSequence, -+ mResizeTextAreaFormatString, -+ (INT32)TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows, -+ (INT32)TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns -+ ); -+ TerminalDevice->OutputEscChar = TRUE; -+ Status = This->OutputString (This, ResizeSequence); -+ TerminalDevice->OutputEscChar = FALSE; -+ if (EFI_ERROR (Status)) { -+ return EFI_DEVICE_ERROR; -+ } -+ } -+ ++ if (PcdGetBool (PcdResizeXterm)) { ++ CHAR16 ResizeSequence[RESIZE_SEQ_SIZE]; ++ ++ UnicodeSPrintAsciiFormat ( ++ ResizeSequence, ++ sizeof ResizeSequence, ++ mResizeTextAreaFormatString, ++ (INT32) TerminalDevice->TerminalConsoleModeData[ModeNumber].Rows, ++ (INT32) TerminalDevice->TerminalConsoleModeData[ModeNumber].Columns ++ ); ++ TerminalDevice->OutputEscChar = TRUE; ++ Status = This->OutputString (This, ResizeSequence); ++ TerminalDevice->OutputEscChar = FALSE; ++ if (EFI_ERROR (Status)) { ++ return EFI_DEVICE_ERROR; ++ } ++ } ++ This->Mode->Mode = (INT32)ModeNumber; Status = This->ClearScreen (This); --- -2.41.0 - +diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +index b2a8aeba85..96810f337c 100644 +--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf ++++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf +@@ -55,6 +55,7 @@ + DebugLib + PcdLib + BaseLib ++ PrintLib + + [Guids] + ## SOMETIMES_PRODUCES ## Variable:L"ConInDev" +@@ -87,6 +88,7 @@ + [Pcd] + gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType ## SOMETIMES_CONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## CONSUMES ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## CONSUMES + + # [Event] + # # Relative timer event set by UnicodeToEfiKey(), used to be one 2 seconds input timeout. diff --git a/0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch b/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch similarity index 87% rename from 0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch rename to 0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch index 7007682..c2f128b 100644 --- a/0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +++ b/0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch @@ -1,17 +1,12 @@ -From 20ba2d80413888bfcb1f5e5ba914b5c67fc4ced2 Mon Sep 17 00:00:00 2001 +From cf04a1c13e796013f0cb06447127cf5cf35eb0a0 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 14 Oct 2015 15:59:06 +0200 -Subject: [PATCH 04/14] OvmfPkg: take PcdResizeXterm from the QEMU command line - (RH only) +Subject: [PATCH] OvmfPkg: take PcdResizeXterm from the QEMU command line (RH + only) -edk2-stable202205 rebase +Notes about edk2-stable202205 rebase -- re-add UPDATE_BOOLEAN_PCD_FROM_FW_CFG -- add microvm, cloudhw and inteltdx - -edk2-stable202108 rebase - -- resolve conflict in OvmfPkg/PlatformPei/PlatformPei.inf +- Necessary minor fixes for upstream changes Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -79,67 +74,68 @@ Signed-off-by: Laszlo Ersek OvmfPkg/AmdSev/AmdSevX64.dsc | 1 + OvmfPkg/CloudHv/CloudHvX64.dsc | 1 + OvmfPkg/IntelTdx/IntelTdxX64.dsc | 1 + - OvmfPkg/Microvm/MicrovmX64.dsc | 1 + + OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- OvmfPkg/OvmfPkgIa32.dsc | 1 + OvmfPkg/OvmfPkgIa32X64.dsc | 1 + OvmfPkg/OvmfPkgX64.dsc | 1 + - OvmfPkg/PlatformPei/PlatformPei.inf | 1 + OvmfPkg/PlatformPei/Platform.c | 13 +++++++++++++ - 9 files changed, 21 insertions(+) + 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 2c6ed7c9745f..cf81a86c67dd 100644 +index a31a89344a..d6bfc43fe5 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -477,6 +477,7 @@ [PcdsFixedAtBuild] +@@ -484,6 +484,7 @@ [PcdsDynamicDefault] gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE ++ 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 e000deed9e4d..7a167bd4d039 100644 +index b522fa1059..c5fd84027f 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc -@@ -576,6 +576,7 @@ [PcdsDynamicDefault] +@@ -579,6 +579,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE ++ 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 193657ff2d61..bfcd486976cf 100644 +index 82e3e41cfc..6d72b80dc9 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc -@@ -474,6 +474,7 @@ [PcdsDynamicDefault] +@@ -477,6 +477,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE ++ 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 2f7585639374..023b7b0fe959 100644 +index 063324cd05..53222d80be 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc -@@ -577,6 +577,7 @@ [PcdsDynamicDefault] +@@ -582,7 +582,7 @@ + # only set when # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 - -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE +- ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 80d8e370095d..2395bcf6b8dc 100644 +index 28379961a7..4f6dfedc2c 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -604,6 +604,7 @@ [PcdsDynamicDefault] +@@ -599,6 +599,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -148,10 +144,10 @@ index 80d8e370095d..2395bcf6b8dc 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index d9757149e359..9bf5ac0d143c 100644 +index 5e9eee628a..923e187942 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -616,6 +616,7 @@ [PcdsDynamicDefault] +@@ -611,6 +611,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -160,10 +156,10 @@ index d9757149e359..9bf5ac0d143c 100644 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index b12d874daa0a..69deaf8e08ec 100644 +index bf4c7906c4..06b38b1715 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -634,6 +634,7 @@ [PcdsDynamicDefault] +@@ -629,6 +629,7 @@ # ($(SMM_REQUIRE) == FALSE) gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved|0 @@ -171,38 +167,26 @@ index b12d874daa0a..69deaf8e08ec 100644 !if $(SMM_REQUIRE) == FALSE gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|0 gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|0 -diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf -index 3934aeed9514..98123ec63b3d 100644 ---- a/OvmfPkg/PlatformPei/PlatformPei.inf -+++ b/OvmfPkg/PlatformPei/PlatformPei.inf -@@ -100,6 +100,7 @@ [Pcd] - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize - gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize - gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm - gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode - gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable - gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c -index f5dc41c3a8c4..ce9868d57de1 100644 +index f5dc41c3a8..f244dcd24d 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -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) -+ ++#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_PEI_PPI_DESCRIPTOR mPpiBootMode[] = { { EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST, @@ -210,10 +194,19 @@ index f5dc41c3a8c4..ce9868d57de1 100644 MemTypeInfoInitialization (PlatformInfoHob); MemMapInitialization (PlatformInfoHob); NoexecDxeInitialization (PlatformInfoHob); -+ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm); ++ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm); } InstallClearCacheCallback (); --- -2.41.0 - +diff --git a/OvmfPkg/PlatformPei/PlatformPei.inf b/OvmfPkg/PlatformPei/PlatformPei.inf +index ad52be3065..d7d688284b 100644 +--- a/OvmfPkg/PlatformPei/PlatformPei.inf ++++ b/OvmfPkg/PlatformPei/PlatformPei.inf +@@ -100,6 +100,7 @@ + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize + gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvStoreReserved ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm + gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode + gEfiMdeModulePkgTokenSpaceGuid.PcdUse1GPageTable + gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack diff --git a/0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch b/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch similarity index 94% rename from 0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch rename to 0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch index e3af6d5..51096ae 100644 --- a/0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +++ b/0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch @@ -1,8 +1,8 @@ -From 5b56419459e64d33cd92b4b98ef954bca8f9f344 Mon Sep 17 00:00:00 2001 +From 65e47dac7f0c2cc4d5fa2513f4a217a060c9da3c Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Sun, 26 Jul 2015 08:02:50 +0000 -Subject: [PATCH 05/14] ArmVirtPkg: take PcdResizeXterm from the QEMU command - line (RH only) +Subject: [PATCH] ArmVirtPkg: take PcdResizeXterm from the QEMU command line + (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -89,116 +89,113 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit a5f7a57bf390f1f340ff1d1f1884a73716817ef1) --- ArmVirtPkg/ArmVirtQemu.dsc | 7 +++- - .../TerminalPcdProducerLib.inf | 33 ++++++++++++++++++ .../TerminalPcdProducerLib.c | 34 +++++++++++++++++++ + .../TerminalPcdProducerLib.inf | 33 ++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-) - create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c + create mode 100644 ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 1e0225951aef..9f52eb44a1fd 100644 +index e48c75b5e9..181265057e 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -308,6 +308,8 @@ [PcdsPatchableInModule] +@@ -309,6 +309,8 @@ gEfiSecurityPkgTokenSpaceGuid.PcdTpmBaseAddress|0x0 !endif -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE -+ ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm|FALSE ++ [PcdsDynamicHii] gUefiOvmfPkgTokenSpaceGuid.PcdForceNoAcpi|L"ForceNoAcpi"|gOvmfVariableGuid|0x0|FALSE|NV,BS -@@ -417,7 +419,10 @@ [Components.common] +@@ -418,7 +420,10 @@ MdeModulePkg/Universal/Console/ConPlatformDxe/ConPlatformDxe.inf MdeModulePkg/Universal/Console/ConSplitterDxe/ConSplitterDxe.inf MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsoleDxe.inf - MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf -+ MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf { -+ -+ NULL|ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf -+ } ++ MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf { ++ ++ NULL|ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf ++ } MdeModulePkg/Universal/SerialDxe/SerialDxe.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf -diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf -new file mode 100644 -index 000000000000..a51dbd1670a8 ---- /dev/null -+++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf -@@ -0,0 +1,33 @@ -+## @file -+# Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg -+# -+# Copyright (C) 2015-2020, Red Hat, Inc. -+# Copyright (c) 2014, Linaro Ltd. All rights reserved.
-+# -+# SPDX-License-Identifier: BSD-2-Clause-Patent -+## -+ -+[Defines] -+ INF_VERSION = 0x00010005 -+ BASE_NAME = TerminalPcdProducerLib -+ FILE_GUID = 4a0c5ed7-8c42-4c01-8f4c-7bf258316a96 -+ MODULE_TYPE = BASE -+ VERSION_STRING = 1.0 -+ LIBRARY_CLASS = NULL -+ CONSTRUCTOR = TerminalPcdProducerLibConstructor -+ -+[Sources] -+ TerminalPcdProducerLib.c -+ -+[Packages] -+ MdeModulePkg/MdeModulePkg.dec -+ MdePkg/MdePkg.dec -+ OvmfPkg/OvmfPkg.dec -+ -+[LibraryClasses] -+ DebugLib -+ PcdLib -+ QemuFwCfgSimpleParserLib -+ -+[Pcd] -+ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## SOMETIMES_PRODUCES diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c new file mode 100644 -index 000000000000..bfd3a6a535f9 +index 0000000000..37f71c5e4c --- /dev/null +++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.c @@ -0,0 +1,34 @@ -+/** @file -+* Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg -+* -+* Copyright (C) 2015-2020, Red Hat, Inc. -+* Copyright (c) 2014, Linaro Ltd. All rights reserved.
-+* -+* SPDX-License-Identifier: BSD-2-Clause-Patent -+**/ -+ -+#include -+#include -+#include -+ -+#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \ -+ do { \ -+ BOOLEAN Setting; \ -+ RETURN_STATUS PcdStatus; \ -+ \ -+ if (!RETURN_ERROR (QemuFwCfgParseBool ( \ -+ "opt/org.tianocore.edk2.aavmf/" #TokenName, &Setting))) { \ -+ PcdStatus = PcdSetBoolS (TokenName, Setting); \ -+ ASSERT_RETURN_ERROR (PcdStatus); \ -+ } \ -+ } while (0) -+ -+RETURN_STATUS -+EFIAPI -+TerminalPcdProducerLibConstructor ( -+ VOID -+ ) -+{ -+ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm); -+ return RETURN_SUCCESS; -+} --- -2.41.0 - ++/** @file ++* Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg ++* ++* Copyright (C) 2015-2020, Red Hat, Inc. ++* Copyright (c) 2014, Linaro Ltd. All rights reserved.
++* ++* SPDX-License-Identifier: BSD-2-Clause-Patent ++**/ ++ ++#include ++#include ++#include ++ ++#define UPDATE_BOOLEAN_PCD_FROM_FW_CFG(TokenName) \ ++ do { \ ++ BOOLEAN Setting; \ ++ RETURN_STATUS PcdStatus; \ ++ \ ++ if (!RETURN_ERROR (QemuFwCfgParseBool ( \ ++ "opt/org.tianocore.edk2.aavmf/" #TokenName, &Setting))) { \ ++ PcdStatus = PcdSetBoolS (TokenName, Setting); \ ++ ASSERT_RETURN_ERROR (PcdStatus); \ ++ } \ ++ } while (0) ++ ++RETURN_STATUS ++EFIAPI ++TerminalPcdProducerLibConstructor ( ++ VOID ++ ) ++{ ++ UPDATE_BOOLEAN_PCD_FROM_FW_CFG (PcdResizeXterm); ++ return RETURN_SUCCESS; ++} +diff --git a/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf +new file mode 100644 +index 0000000000..c840f6f97a +--- /dev/null ++++ b/ArmVirtPkg/Library/TerminalPcdProducerLib/TerminalPcdProducerLib.inf +@@ -0,0 +1,33 @@ ++## @file ++# Plugin library for setting up dynamic PCDs for TerminalDxe, from fw_cfg ++# ++# Copyright (C) 2015-2020, Red Hat, Inc. ++# Copyright (c) 2014, Linaro Ltd. All rights reserved.
++# ++# SPDX-License-Identifier: BSD-2-Clause-Patent ++## ++ ++[Defines] ++ INF_VERSION = 0x00010005 ++ BASE_NAME = TerminalPcdProducerLib ++ FILE_GUID = 4a0c5ed7-8c42-4c01-8f4c-7bf258316a96 ++ MODULE_TYPE = BASE ++ VERSION_STRING = 1.0 ++ LIBRARY_CLASS = NULL ++ CONSTRUCTOR = TerminalPcdProducerLibConstructor ++ ++[Sources] ++ TerminalPcdProducerLib.c ++ ++[Packages] ++ MdeModulePkg/MdeModulePkg.dec ++ MdePkg/MdePkg.dec ++ OvmfPkg/OvmfPkg.dec ++ ++[LibraryClasses] ++ DebugLib ++ PcdLib ++ QemuFwCfgSimpleParserLib ++ ++[Pcd] ++ gEfiMdeModulePkgTokenSpaceGuid.PcdResizeXterm ## SOMETIMES_PRODUCES diff --git a/0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch b/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch similarity index 90% rename from 0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch rename to 0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch index f1e5aa2..560e9c3 100644 --- a/0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +++ b/0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch @@ -1,7 +1,7 @@ -From 6f1c7583bce90e89193ae40042923f16c6e16ca7 Mon Sep 17 00:00:00 2001 +From cf51a0c4a259a505f58c1cf626864f41cf3f27ef Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:45 +0100 -Subject: [PATCH 06/14] OvmfPkg: enable DEBUG_VERBOSE (RHEL only) +Subject: [PATCH] OvmfPkg: enable DEBUG_VERBOSE (RHEL only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -65,23 +65,23 @@ 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 cf81a86c67dd..d8b1c4d9e8af 100644 +index d6bfc43fe5..2b4c551773 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -427,7 +427,7 @@ [PcdsFixedAtBuild] +@@ -429,7 +429,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error - gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8040004F !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 2395bcf6b8dc..21118b11f6b3 100644 +index 4f6dfedc2c..ae3b446ff2 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -537,7 +537,7 @@ [PcdsFixedAtBuild] +@@ -535,7 +535,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -91,10 +91,10 @@ index 2395bcf6b8dc..21118b11f6b3 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 9bf5ac0d143c..afb1afcceb61 100644 +index 923e187942..4a547f28c0 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -544,7 +544,7 @@ [PcdsFixedAtBuild] +@@ -542,7 +542,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -104,10 +104,10 @@ index 9bf5ac0d143c..afb1afcceb61 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 69deaf8e08ec..45e0658e2b4a 100644 +index 06b38b1715..68bd1f6dcb 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -563,7 +563,7 @@ [PcdsFixedAtBuild] +@@ -561,7 +561,7 @@ # DEBUG_VERBOSE 0x00400000 // Detailed debug messages that may # // significantly impact boot performance # DEBUG_ERROR 0x80000000 // Error @@ -116,6 +116,3 @@ index 69deaf8e08ec..45e0658e2b4a 100644 !if $(SOURCE_DEBUG_ENABLE) == TRUE gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x17 --- -2.41.0 - diff --git a/0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch b/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch similarity index 86% rename from 0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch rename to 0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch index 42f4f55..963581b 100644 --- a/0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +++ b/0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch @@ -1,9 +1,13 @@ -From eaf1ac5c40d16705219e5021d4878e52904467ba Mon Sep 17 00:00:00 2001 +From 3ece2f792aec743c42c415809846ea1ac1f0aedf Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:46 +0100 -Subject: [PATCH 07/14] OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in +Subject: [PATCH] OvmfPkg: silence DEBUG_VERBOSE (0x00400000) in QemuVideoDxe/QemuRamfbDxe (RH) +edk2-stable202402 rebase: + +- context changes due to CSM support removal. + Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -82,41 +86,40 @@ 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 d8b1c4d9e8af..b3b70b600139 100644 +index 2b4c551773..f81a0ac375 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -685,8 +685,14 @@ [Components] +@@ -691,8 +691,14 @@ + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf - MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf - OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf - OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -+ OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } ++ OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F ++ } ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F ++ } OvmfPkg/VirtioGpuDxe/VirtioGpu.inf # diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 21118b11f6b3..8686da30008f 100644 +index ae3b446ff2..7e07fbfd46 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -850,9 +850,15 @@ [Components] - MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf +@@ -828,8 +828,14 @@ + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf - !ifndef $(CSM_ENABLE) - OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf { + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } - !endif -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F @@ -125,20 +128,19 @@ index 21118b11f6b3..8686da30008f 100644 # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index afb1afcceb61..4b9c0b312532 100644 +index 4a547f28c0..f28c71a7a8 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -868,9 +868,15 @@ [Components.X64] - MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf +@@ -842,8 +842,14 @@ + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf - !ifndef $(CSM_ENABLE) - OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf { + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } - !endif -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F @@ -147,20 +149,19 @@ index afb1afcceb61..4b9c0b312532 100644 # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 45e0658e2b4a..9b83e51ba3c1 100644 +index 68bd1f6dcb..680bdb5f4c 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -936,9 +936,15 @@ [Components] - MdeModulePkg/Universal/MemoryTest/NullMemoryTestDxe/NullMemoryTestDxe.inf +@@ -910,8 +910,14 @@ + MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf + MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf - !ifndef $(CSM_ENABLE) - OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf +- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf { + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } - !endif -- OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf + OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F @@ -168,6 +169,3 @@ index 45e0658e2b4a..9b83e51ba3c1 100644 OvmfPkg/VirtioGpuDxe/VirtioGpu.inf # --- -2.41.0 - diff --git a/0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch b/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch similarity index 91% rename from 0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch rename to 0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch index 01d9244..0fa78ac 100644 --- a/0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +++ b/0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch @@ -1,7 +1,7 @@ -From 298ab8d033dac6298239b70a6494eb2de472e54f Mon Sep 17 00:00:00 2001 +From 33b60bfb25647368c761ae9d875c481086e147ce Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 27 Jan 2016 03:05:18 +0100 -Subject: [PATCH 08/14] ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in +Subject: [PATCH] ArmVirtPkg: silence DEBUG_VERBOSE (0x00400000) in QemuRamfbDxe (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> @@ -61,37 +61,34 @@ Signed-off-by: Laszlo Ersek 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc -index 9f52eb44a1fd..8b44fadeeb39 100644 +index 181265057e..216b5a09cc 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc -@@ -546,7 +546,10 @@ [Components.common] +@@ -547,7 +547,10 @@ # # Video support # - OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF -+ } ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF ++ } OvmfPkg/VirtioGpuDxe/VirtioGpu.inf OvmfPkg/PlatformDxe/Platform.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc -index 8ef5927b53ff..2503cdb79c27 100644 +index 668a65ba64..5f07ed4dcc 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc -@@ -446,7 +446,10 @@ [Components.common] +@@ -447,7 +447,10 @@ # # Video support # - OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -+ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF -+ } ++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|($(DEBUG_PRINT_ERROR_LEVEL)) & 0xFFBFFFFF ++ } OvmfPkg/VirtioGpuDxe/VirtioGpu.inf OvmfPkg/PlatformDxe/Platform.inf --- -2.41.0 - diff --git a/0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch b/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch similarity index 85% rename from 0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch rename to 0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch index 2190629..689d192 100644 --- a/0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +++ b/0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch @@ -1,8 +1,8 @@ -From ad5e6471ec1d395c6395d0e9775a88e239570884 Mon Sep 17 00:00:00 2001 +From d4be04b114213cc9b8ee4ce86a91a1c7e2c3928a Mon Sep 17 00:00:00 2001 From: Philippe Mathieu-Daude Date: Thu, 1 Aug 2019 20:43:48 +0200 -Subject: [PATCH 09/14] OvmfPkg: QemuRamfbDxe: Do not report DXE failure on - Aarch64 silent builds (RH only) +Subject: [PATCH] OvmfPkg: QemuRamfbDxe: Do not report DXE failure on Aarch64 + silent builds (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -42,55 +42,51 @@ Signed-off-by: Laszlo Ersek (cherry picked from commit aa2b66b18a62d652bdbefae7b5732297294306ca) (cherry picked from commit deb3451034326b75fd760aba47a5171493ff055e) --- + OvmfPkg/QemuRamfbDxe/QemuRamfb.c | 14 ++++++++++++++ OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf | 1 + - OvmfPkg/QemuRamfbDxe/QemuRamfb.c | 15 +++++++++++++++ - 2 files changed, 16 insertions(+) + 2 files changed, 15 insertions(+) -diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -index e3890b8c202f..6ffee5acb24c 100644 ---- a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -+++ b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf -@@ -29,6 +29,7 @@ [LibraryClasses] - BaseLib - BaseMemoryLib - DebugLib -+ DebugPrintErrorLevelLib - DevicePathLib - FrameBufferBltLib - MemoryAllocationLib diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c -index 5a1044f0dc7b..3a687901b0d2 100644 +index 5a1044f0dc..83c6d26c74 100644 --- a/OvmfPkg/QemuRamfbDxe/QemuRamfb.c +++ b/OvmfPkg/QemuRamfbDxe/QemuRamfb.c @@ -13,6 +13,7 @@ #include #include #include -+#include ++#include #include #include #include -@@ -259,6 +260,20 @@ InitializeQemuRamfb ( +@@ -259,6 +260,19 @@ InitializeQemuRamfb ( Status = QemuFwCfgFindFile ("etc/ramfb", &mRamfbFwCfgItem, &FwCfgSize); if (EFI_ERROR (Status)) { -+ #if defined (MDE_CPU_AARCH64) -+ // -+ // RHBZ#1714446 -+ // If no ramfb device was configured, this platform DXE driver should -+ // returns EFI_NOT_FOUND, so the DXE Core can unload it. However, even -+ // using a silent build, an error message is issued to the guest console. -+ // Since this confuse users, return success and stay resident. The wasted -+ // guest RAM still gets freed later after ExitBootServices(). -+ // -+ if (GetDebugPrintErrorLevel () == DEBUG_ERROR) { -+ return EFI_SUCCESS; -+ } -+ -+ #endif ++#if defined (MDE_CPU_AARCH64) ++ // ++ // RHBZ#1714446 ++ // If no ramfb device was configured, this platform DXE driver should ++ // returns EFI_NOT_FOUND, so the DXE Core can unload it. However, even ++ // using a silent build, an error message is issued to the guest console. ++ // Since this confuse users, return success and stay resident. The wasted ++ // guest RAM still gets freed later after ExitBootServices(). ++ // ++ if (GetDebugPrintErrorLevel () == DEBUG_ERROR) { ++ return EFI_SUCCESS; ++ } ++#endif return EFI_NOT_FOUND; } --- -2.41.0 - +diff --git a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +index e3890b8c20..f79a4bc987 100644 +--- a/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf ++++ b/OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +@@ -29,6 +29,7 @@ + BaseLib + BaseMemoryLib + DebugLib ++ DebugPrintErrorLevelLib + DevicePathLib + FrameBufferBltLib + MemoryAllocationLib diff --git a/0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch b/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch similarity index 90% rename from 0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch rename to 0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch index 07f41e1..e8608d1 100644 --- a/0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +++ b/0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch @@ -1,8 +1,8 @@ -From a5c8a37b20394f8b2595c0e520955667b4c17527 Mon Sep 17 00:00:00 2001 +From e76b481430fc3ef2398cdbe4d21ce002050aa12b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 21 Nov 2017 00:57:47 +0100 -Subject: [PATCH 10/14] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in - NvmExpressDxe (RH only) +Subject: [PATCH] OvmfPkg: silence EFI_D_VERBOSE (0x00400000) in NvmExpressDxe + (RH only) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -63,26 +63,26 @@ 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 b3b70b600139..865d150a2871 100644 +index f81a0ac375..bdb786d10d 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc -@@ -679,7 +679,10 @@ [Components] +@@ -686,7 +686,10 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf - MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf -+ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { -+ -+ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F -+ } ++ MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf { ++ ++ gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F ++ } MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index 8686da30008f..9cd981ae7be8 100644 +index 7e07fbfd46..8a8c7a0b37 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -843,7 +843,10 @@ [Components] +@@ -823,7 +823,10 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -95,10 +95,10 @@ index 8686da30008f..9cd981ae7be8 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 4b9c0b312532..9186ab2ba83b 100644 +index f28c71a7a8..4bde14a05a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -861,7 +861,10 @@ [Components.X64] +@@ -837,7 +837,10 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -111,10 +111,10 @@ index 4b9c0b312532..9186ab2ba83b 100644 MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 9b83e51ba3c1..a059f143f5be 100644 +index 680bdb5f4c..a43352ede4 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -929,7 +929,10 @@ [Components] +@@ -905,7 +905,10 @@ MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf @@ -126,6 +126,3 @@ index 9b83e51ba3c1..a059f143f5be 100644 MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf --- -2.41.0 - diff --git a/0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch b/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch similarity index 82% rename from 0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch rename to 0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch index d750541..48c53fc 100644 --- a/0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +++ b/0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch @@ -1,8 +1,8 @@ -From 8cc002364f8c51114a39782737088331a7c6c5c3 Mon Sep 17 00:00:00 2001 +From 47ad6974185793994d69620d989f6d695f513c9c Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:31:36 +0200 -Subject: [PATCH 11/14] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no - "-kernel" in silent aa64 build (RH) +Subject: [PATCH] OvmfPkg/QemuKernelLoaderFsDxe: suppress error on no "-kernel" + in silent aa64 build (RH) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -27,58 +27,54 @@ Signed-off-by: Laszlo Ersek Signed-off-by: Miroslav Rezanina (cherry picked from commit 9adcdf493ebbd11efb74e2905ab5f6c8996e096d) --- - .../QemuKernelLoaderFsDxe.inf | 1 + - .../QemuKernelLoaderFsDxe.c | 18 ++++++++++++++++++ - 2 files changed, 19 insertions(+) + .../QemuKernelLoaderFsDxe.c | 17 +++++++++++++++++ + .../QemuKernelLoaderFsDxe.inf | 1 + + 2 files changed, 18 insertions(+) -diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf -index 7b35adb8e034..e0331c6e2cbc 100644 ---- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf -+++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf -@@ -28,6 +28,7 @@ [LibraryClasses] - BaseLib - BaseMemoryLib - DebugLib -+ DebugPrintErrorLevelLib - DevicePathLib - MemoryAllocationLib - QemuFwCfgLib diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c -index 3c12085f6c1e..e473c0b57345 100644 +index 3c12085f6c..e192809198 100644 --- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c +++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.c @@ -19,6 +19,7 @@ #include #include #include -+#include ++#include #include #include #include -@@ -1081,6 +1082,23 @@ QemuKernelLoaderFsDxeEntrypoint ( +@@ -1081,6 +1082,22 @@ QemuKernelLoaderFsDxeEntrypoint ( if (KernelBlob->Data == NULL) { Status = EFI_NOT_FOUND; -+ #if defined (MDE_CPU_AARCH64) -+ // -+ // RHBZ#1844682 -+ // -+ // If the "-kernel" QEMU option is not being used, this platform DXE driver -+ // should return EFI_NOT_FOUND, so that the DXE Core can unload it. -+ // However, the associated error message, logged by the DXE Core to the -+ // serial console, is not desired in the silent edk2-aarch64 build, given -+ // that the absence of "-kernel" is nothing out of the ordinary. Therefore, -+ // return success and stay resident. The wasted guest RAM still gets freed -+ // after ExitBootServices(). -+ // -+ if (GetDebugPrintErrorLevel () == DEBUG_ERROR) { -+ Status = EFI_SUCCESS; -+ } -+ -+ #endif ++#if defined (MDE_CPU_AARCH64) ++ // ++ // RHBZ#1844682 ++ // ++ // If the "-kernel" QEMU option is not being used, this platform DXE driver ++ // should return EFI_NOT_FOUND, so that the DXE Core can unload it. ++ // However, the associated error message, logged by the DXE Core to the ++ // serial console, is not desired in the silent edk2-aarch64 build, given ++ // that the absence of "-kernel" is nothing out of the ordinary. Therefore, ++ // return success and stay resident. The wasted guest RAM still gets freed ++ // after ExitBootServices(). ++ // ++ if (GetDebugPrintErrorLevel () == DEBUG_ERROR) { ++ Status = EFI_SUCCESS; ++ } ++#endif goto FreeBlobs; } --- -2.41.0 - +diff --git a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf +index 7b35adb8e0..23d9f5fca1 100644 +--- a/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf ++++ b/OvmfPkg/QemuKernelLoaderFsDxe/QemuKernelLoaderFsDxe.inf +@@ -28,6 +28,7 @@ + BaseLib + BaseMemoryLib + DebugLib ++ DebugPrintErrorLevelLib + DevicePathLib + MemoryAllocationLib + QemuFwCfgLib diff --git a/0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch b/0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch similarity index 89% rename from 0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch rename to 0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch index b9ef431..c282c85 100644 --- a/0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +++ b/0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch @@ -1,8 +1,8 @@ -From 14b635b6d18976cc9661001ce0a5fa3d5eec786f Mon Sep 17 00:00:00 2001 +From 26a8f215a1cee1b876105127ad22c68a7c07c6a8 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Wed, 24 Jun 2020 11:40:09 +0200 -Subject: [PATCH 12/14] SecurityPkg/Tcg2Dxe: suppress error on no swtpm in - silent aa64 build (RH) +Subject: [PATCH] SecurityPkg/Tcg2Dxe: suppress error on no swtpm in silent + aa64 build (RH) Notes about the RHEL-8.3/20200603-ca407c7246bf [edk2-stable202005] -> RHEL-8.5/20210520-e1999b264f1f [edk2-stable202105] rebase: @@ -26,31 +26,19 @@ Signed-off-by: Laszlo Ersek Signed-off-by: Miroslav Rezanina (cherry picked from commit cbce29f7749477e271f9764fed82de94724af5df) --- - SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf | 1 + SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c | 17 +++++++++++++++++ + SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf | 1 + 2 files changed, 18 insertions(+) -diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -index 7dc7a2683d71..3bc88339311e 100644 ---- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -+++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf -@@ -55,6 +55,7 @@ [LibraryClasses] - UefiRuntimeServicesTableLib - BaseMemoryLib - DebugLib -+ DebugPrintErrorLevelLib - Tpm2CommandLib - PrintLib - UefiLib diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c -index f6ea8b2bbf18..681eb7e08b98 100644 +index f6ea8b2bbf..1fd5e187fb 100644 --- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c +++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.c @@ -28,6 +28,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #include #include -+#include ++#include #include #include #include @@ -58,25 +46,34 @@ index f6ea8b2bbf18..681eb7e08b98 100644 CompareGuid (PcdGetPtr (PcdTpmInstanceGuid), &gEfiTpmDeviceInstanceTpm12Guid)) { DEBUG ((DEBUG_INFO, "No TPM2 instance required!\n")); -+#if defined (MDE_CPU_AARCH64) -+ // -+ // RHBZ#1844682 -+ // -+ // If swtpm / vTPM2 is not being used, this driver should return -+ // EFI_UNSUPPORTED, so that the DXE Core can unload it. However, the -+ // associated error message, logged by the DXE Core to the serial console, -+ // is not desired in the silent edk2-aarch64 build, given that the absence -+ // of swtpm / vTPM2 is nothing out of the ordinary. Therefore, return -+ // success and stay resident. The wasted guest RAM still gets freed after -+ // ExitBootServices(). -+ // -+ if (GetDebugPrintErrorLevel () == DEBUG_ERROR) { -+ return EFI_SUCCESS; -+ } -+#endif ++#if defined (MDE_CPU_AARCH64) ++ // ++ // RHBZ#1844682 ++ // ++ // If swtpm / vTPM2 is not being used, this driver should return ++ // EFI_UNSUPPORTED, so that the DXE Core can unload it. However, the ++ // associated error message, logged by the DXE Core to the serial console, ++ // is not desired in the silent edk2-aarch64 build, given that the absence ++ // of swtpm / vTPM2 is nothing out of the ordinary. Therefore, return ++ // success and stay resident. The wasted guest RAM still gets freed after ++ // ExitBootServices(). ++ // ++ if (GetDebugPrintErrorLevel () == DEBUG_ERROR) { ++ return EFI_SUCCESS; ++ } ++#endif return EFI_UNSUPPORTED; } --- -2.41.0 - +diff --git a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +index 7dc7a2683d..ae90070b36 100644 +--- a/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf ++++ b/SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf +@@ -55,6 +55,7 @@ + UefiRuntimeServicesTableLib + BaseMemoryLib + DebugLib ++ DebugPrintErrorLevelLib + Tpm2CommandLib + PrintLib + UefiLib diff --git a/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch new file mode 100644 index 0000000..48713c7 --- /dev/null +++ b/0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch @@ -0,0 +1,126 @@ +From 14feac56ff842b1a9940f370ebc624846841faec 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) +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: [2/19] 6777c3dc453e4aecddc20216f783ba2a5acccaa0 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove EFI Byte Code interpreter. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + OvmfPkg/AmdSev/AmdSevX64.dsc | 1 - + OvmfPkg/AmdSev/AmdSevX64.fdf | 1 - + OvmfPkg/OvmfPkgIa32.dsc | 1 - + OvmfPkg/OvmfPkgIa32.fdf | 1 - + OvmfPkg/OvmfPkgIa32X64.dsc | 1 - + OvmfPkg/OvmfPkgIa32X64.fdf | 1 - + OvmfPkg/OvmfPkgX64.dsc | 1 - + OvmfPkg/OvmfPkgX64.fdf | 1 - + 8 files changed, 8 deletions(-) + +diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc +index bdb786d10d..e565430e6c 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.dsc ++++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +@@ -611,7 +611,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc + } + +- MdeModulePkg/Universal/EbcDxe/EbcDxe.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 9dd4095967..78b4e1d528 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.fdf ++++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +@@ -206,7 +206,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 + INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index 8a8c7a0b37..ee8da63252 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -746,7 +746,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc + } + +- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf + UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf + UefiCpuPkg/CpuDxe/CpuDxe.inf + OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 501b4de469..5e0bc9d2c5 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 UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf + INF UefiCpuPkg/CpuDxe/CpuDxe.inf + INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index 4bde14a05a..1c7b55a430 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -760,7 +760,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc + } + +- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf + UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf + UefiCpuPkg/CpuDxe/CpuDxe.inf + OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index 74cfb58f06..ed33c906f3 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 + INF OvmfPkg/LocalApicTimerDxe/LocalApicTimerDxe.inf +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index a43352ede4..9807c0a6b4 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -805,7 +805,6 @@ + !include OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc + } + +- MdeModulePkg/Universal/EbcDxe/EbcDxe.inf + UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf + + UefiCpuPkg/CpuDxe/CpuDxe.inf { +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index f47ab1727e..feb3228ae2 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -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 UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf + + INF UefiCpuPkg/CpuDxe/CpuDxe.inf diff --git a/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch b/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch new file mode 100644 index 0000000..0e29d5a --- /dev/null +++ b/0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch @@ -0,0 +1,126 @@ +From 94f1e0809390547cbfb0ed0e650a773c24b553ed 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) +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: [4/19] f0a41317291f2e9e3b5bd3125149c3866f23ab08 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +QemuVideoDxe binds virtio-vga, so VirtioGpu is not needed. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + OvmfPkg/AmdSev/AmdSevX64.dsc | 1 - + OvmfPkg/AmdSev/AmdSevX64.fdf | 1 - + OvmfPkg/OvmfPkgIa32.dsc | 1 - + OvmfPkg/OvmfPkgIa32.fdf | 1 - + OvmfPkg/OvmfPkgIa32X64.dsc | 1 - + OvmfPkg/OvmfPkgIa32X64.fdf | 1 - + OvmfPkg/OvmfPkgX64.dsc | 1 - + OvmfPkg/OvmfPkgX64.fdf | 1 - + 8 files changed, 8 deletions(-) + +diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc +index e565430e6c..c000cc8de8 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.dsc ++++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +@@ -701,7 +701,6 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } +- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + + # + # ISA Support +diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +index 78b4e1d528..d6f785c205 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.fdf ++++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +@@ -300,7 +300,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + + INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +-INF OvmfPkg/VirtioGpuDxe/VirtioGpu.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 ee8da63252..254d9f13f3 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -838,7 +838,6 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } +- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + + # + # ISA Support +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 5e0bc9d2c5..dec1258714 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -321,7 +321,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +-INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + INF OvmfPkg/PlatformDxe/Platform.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf + +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index 1c7b55a430..a3a753bd8b 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -852,7 +852,6 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } +- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + + # + # ISA Support +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index ed33c906f3..00bd49c89d 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -327,7 +327,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +-INF OvmfPkg/VirtioGpuDxe/VirtioGpu.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 9807c0a6b4..17cc17cbde 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -920,7 +920,6 @@ + + gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x8000004F + } +- OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + + # + # ISA Support +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index feb3228ae2..bee30d8b4f 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -354,7 +354,6 @@ INF MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + INF OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf + INF OvmfPkg/QemuRamfbDxe/QemuRamfbDxe.inf +-INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + INF OvmfPkg/PlatformDxe/Platform.inf + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch b/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch new file mode 100644 index 0000000..87d342d --- /dev/null +++ b/0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch @@ -0,0 +1,100 @@ +From 0a61aba4d91c63ca263f628093331f6178728ad1 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) +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: [9/19] b40d8a6b9c38568a74fb922b12bbae9f0e721f95 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the virtio-fs driver. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + OvmfPkg/OvmfPkgIa32.dsc | 1 - + OvmfPkg/OvmfPkgIa32.fdf | 1 - + OvmfPkg/OvmfPkgIa32X64.dsc | 1 - + OvmfPkg/OvmfPkgIa32X64.fdf | 1 - + OvmfPkg/OvmfPkgX64.dsc | 1 - + OvmfPkg/OvmfPkgX64.fdf | 1 - + 6 files changed, 6 deletions(-) + +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index 254d9f13f3..ca07b40857 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -816,7 +816,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +- OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index dec1258714..55d0f1ae5f 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -290,7 +290,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + + INF FatPkg/EnhancedFatDxe/Fat.inf + INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +-INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index a3a753bd8b..a5322783e5 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -830,7 +830,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +- OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index 00bd49c89d..fba268521b 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + + INF FatPkg/EnhancedFatDxe/Fat.inf + INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +-INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index 17cc17cbde..190431b6fa 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -898,7 +898,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +- OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index bee30d8b4f..cea0e87cbf 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -316,7 +316,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + + INF FatPkg/EnhancedFatDxe/Fat.inf + INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +-INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf diff --git a/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch new file mode 100644 index 0000000..d4ede51 --- /dev/null +++ b/0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch @@ -0,0 +1,61 @@ +From 068776b4d85587427fbceebf0e79938eea33f68e 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) +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: [10/19] 808ad4385c24fbf34fb0ba359808e6d364e1d030 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the virtio-fs driver. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + ArmVirtPkg/ArmVirtQemu.dsc | 1 - + ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 - + ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc +index 216b5a09cc..1e6c76795b 100644 +--- a/ArmVirtPkg/ArmVirtQemu.dsc ++++ b/ArmVirtPkg/ArmVirtQemu.dsc +@@ -465,7 +465,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +- OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + + # + # Bds +diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +index c5d097ffb9..a814653dc4 100644 +--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc ++++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +@@ -84,7 +84,6 @@ READ_LOCK_STATUS = TRUE + INF FatPkg/EnhancedFatDxe/Fat.inf + INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +- INF OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + + # + # Status Code Routing +diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc +index 5f07ed4dcc..e48bdf8deb 100644 +--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc ++++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc +@@ -365,7 +365,6 @@ + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf + MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf +- OvmfPkg/VirtioFsDxe/VirtioFsDxe.inf + + # + # Bds diff --git a/0017-OvmfPkg-set-PcdVariableStoreSize-PcdMaxVolatileVaria.patch b/0017-OvmfPkg-set-PcdVariableStoreSize-PcdMaxVolatileVaria.patch deleted file mode 100644 index db0fb60..0000000 --- a/0017-OvmfPkg-set-PcdVariableStoreSize-PcdMaxVolatileVaria.patch +++ /dev/null @@ -1,100 +0,0 @@ -From d33fa1e334e7dc75a3cd43728e1c825acd52f5c3 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 25 Sep 2023 09:48:46 +0200 -Subject: [PATCH 17/17] OvmfPkg: set PcdVariableStoreSize + - PcdMaxVolatileVariableSize unconditionally - -Signed-off-by: Gerd Hoffmann ---- - OvmfPkg/OvmfPkgIa32.dsc | 10 ---------- - OvmfPkg/OvmfPkgIa32X64.dsc | 10 ---------- - OvmfPkg/OvmfPkgX64.dsc | 10 ---------- - 3 files changed, 30 deletions(-) - -diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc -index d20afa771c36..1c3437e7437c 100644 ---- a/OvmfPkg/OvmfPkgIa32.dsc -+++ b/OvmfPkg/OvmfPkgIa32.dsc -@@ -493,23 +493,13 @@ [PcdsFixedAtBuild] - !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048) - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800 --!if $(NETWORK_TLS_ENABLE) == FALSE -- # match PcdFlashNvStorageVariableSize purely for convenience -- gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000 --!endif - !endif - !if $(FD_SIZE_IN_KB) == 4096 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400 --!if $(NETWORK_TLS_ENABLE) == FALSE -- # match PcdFlashNvStorageVariableSize purely for convenience -- gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000 - !endif --!endif --!if $(NETWORK_TLS_ENABLE) == TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000 --!endif - - gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE -diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc -index 52a8ac2a5592..87067f468285 100644 ---- a/OvmfPkg/OvmfPkgIa32X64.dsc -+++ b/OvmfPkg/OvmfPkgIa32X64.dsc -@@ -500,23 +500,13 @@ [PcdsFixedAtBuild] - !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048) - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800 --!if $(NETWORK_TLS_ENABLE) == FALSE -- # match PcdFlashNvStorageVariableSize purely for convenience -- gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000 --!endif - !endif - !if $(FD_SIZE_IN_KB) == 4096 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400 --!if $(NETWORK_TLS_ENABLE) == FALSE -- # match PcdFlashNvStorageVariableSize purely for convenience -- gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000 - !endif --!endif --!if $(NETWORK_TLS_ENABLE) == TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000 --!endif - - gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE -diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc -index 4e2459d34e2e..a625399d8246 100644 ---- a/OvmfPkg/OvmfPkgX64.dsc -+++ b/OvmfPkg/OvmfPkgX64.dsc -@@ -519,23 +519,13 @@ [PcdsFixedAtBuild] - !if ($(FD_SIZE_IN_KB) == 1024) || ($(FD_SIZE_IN_KB) == 2048) - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x2800 --!if $(NETWORK_TLS_ENABLE) == FALSE -- # match PcdFlashNvStorageVariableSize purely for convenience -- gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0xe000 --!endif - !endif - !if $(FD_SIZE_IN_KB) == 4096 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x8400 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxAuthVariableSize|0x8400 --!if $(NETWORK_TLS_ENABLE) == FALSE -- # match PcdFlashNvStorageVariableSize purely for convenience -- gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x40000 - !endif --!endif --!if $(NETWORK_TLS_ENABLE) == TRUE - gEfiMdeModulePkgTokenSpaceGuid.PcdVariableStoreSize|0x80000 - gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVolatileVariableSize|0x40000 --!endif - - gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0 - gEfiMdeModulePkgTokenSpaceGuid.PcdStatusCodeUseSerial|FALSE --- -2.42.0 - diff --git a/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch new file mode 100644 index 0000000..8c4cc32 --- /dev/null +++ b/0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -0,0 +1,126 @@ +From 6264a265fc50961c8d44a4c04b9c9e5ad07cc86c 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) +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: [11/19] 21614de37221fca27d4eec0f03c5c8bce5911af3 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the UDF driver. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + OvmfPkg/AmdSev/AmdSevX64.dsc | 1 - + OvmfPkg/AmdSev/AmdSevX64.fdf | 1 - + OvmfPkg/OvmfPkgIa32.dsc | 1 - + OvmfPkg/OvmfPkgIa32.fdf | 1 - + OvmfPkg/OvmfPkgIa32X64.dsc | 1 - + OvmfPkg/OvmfPkgIa32X64.fdf | 1 - + OvmfPkg/OvmfPkgX64.dsc | 1 - + OvmfPkg/OvmfPkgX64.fdf | 1 - + 8 files changed, 8 deletions(-) + +diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc +index c000cc8de8..75bec7859e 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.dsc ++++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +@@ -679,7 +679,6 @@ + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf +diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +index d6f785c205..5d0cba1e13 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.fdf ++++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +@@ -274,7 +274,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf + INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf + + INF FatPkg/EnhancedFatDxe/Fat.inf +-INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index ca07b40857..62907e9458 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -815,7 +815,6 @@ + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 55d0f1ae5f..6c324943e4 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -289,7 +289,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf + INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf + + INF FatPkg/EnhancedFatDxe/Fat.inf +-INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index a5322783e5..28cf5ace70 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -829,7 +829,6 @@ + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index fba268521b..a890d4a3e3 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -290,7 +290,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf + INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf + + INF FatPkg/EnhancedFatDxe/Fat.inf +-INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index 190431b6fa..ca0c007181 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -897,7 +897,6 @@ + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf + MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf + MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index cea0e87cbf..48da04eb9c 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -315,7 +315,6 @@ INF MdeModulePkg/Universal/Acpi/BootScriptExecutorDxe/BootScriptExecutorDxe.inf + INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf + + INF FatPkg/EnhancedFatDxe/Fat.inf +-INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" + INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf diff --git a/0018-silence-.-has-a-LOAD-segment-with-RWX-permissions-wa.patch b/0018-silence-.-has-a-LOAD-segment-with-RWX-permissions-wa.patch deleted file mode 100644 index b8e1c06..0000000 --- a/0018-silence-.-has-a-LOAD-segment-with-RWX-permissions-wa.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f34c799475de60e399463953870c182a08c39f81 Mon Sep 17 00:00:00 2001 -From: Gerd Hoffmann -Date: Mon, 27 Nov 2023 11:04:08 +0100 -Subject: [PATCH 18/18] silence '... has a LOAD segment with RWX permissions' - warning - ---- - BaseTools/Conf/tools_def.template | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template -index c34ecfd557c5..53ac3baa6be3 100755 ---- a/BaseTools/Conf/tools_def.template -+++ b/BaseTools/Conf/tools_def.template -@@ -747,7 +747,7 @@ DEFINE GCC_AARCH64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno- - DEFINE GCC_AARCH64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only - DEFINE GCC_RISCV64_CC_XIPFLAGS = -mstrict-align -mgeneral-regs-only - DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie --DEFINE GCC_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds -+DEFINE GCC_DLINK2_FLAGS_COMMON = -Wl,--script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds -Wl,--no-warn-rwx-segments - DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections - DEFINE GCC_ARM_AARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map - DEFINE GCC_LOONGARCH64_DLINK_COMMON= -Wl,--emit-relocs -nostdlib -Wl,--gc-sections -u $(IMAGE_ENTRY_POINT) -Wl,-e,$(IMAGE_ENTRY_POINT),-Map,$(DEST_DIR_DEBUG)/$(BASE_NAME).map --- -2.43.0 - diff --git a/0019-ArmVirt-Allow-memory-attributes-protocol-to-be-disab.patch b/0019-ArmVirt-Allow-memory-attributes-protocol-to-be-disab.patch deleted file mode 100644 index 45e34ac..0000000 --- a/0019-ArmVirt-Allow-memory-attributes-protocol-to-be-disab.patch +++ /dev/null @@ -1,182 +0,0 @@ -From d93c63a8d3fe63f14b2c9e8dbf6792592fc9ea84 Mon Sep 17 00:00:00 2001 -From: Ard Biesheuvel -Date: Tue, 12 Dec 2023 09:36:00 +0100 -Subject: [PATCH 19/19] ArmVirt: Allow memory attributes protocol to be - disabled - -Shim's PE loader uses the EFI memory attributes protocol in a way that -results in an immediate crash when invoking the loaded image, unless the -base and size of its executable segment are both aligned to 4k. - -If this is not the case, it will strip the memory allocation of its -executable permissions, but fail to add them back for the executable -region, resulting in non-executable code. Unfortunately, the PE loader -does not even bother invoking the protocol in this case (as it notices -the misalignment), making it very hard for system firmware to work -around this by attempting to infer the intent of the caller. - -So let's introduce a QEMU command line option to indicate that the -protocol should not be exposed at all, and a PCD to set the default for -this option when it is omitted. - - -fw_cfg opt/org.tianocore/UninstallMemAttrProtocol,string=y - -Cc: Gerd Hoffmann -Cc: Oliver Steffen -Cc: Alexander Graf -Cc: Oliver Smith-Denny -Cc: Taylor Beebe -Cc: Peter Jones -Cc: Leif Lindholm -Link: https://gitlab.com/qemu-project/qemu/-/issues/1990 -Reviewed-by: Laszlo Ersek -Signed-off-by: Ard Biesheuvel -Tested-by: Gerd Hoffmann -Reviewed-by: Gerd Hoffmann -Message-ID: <20231212083600.1889189-1-ardb@google.com> -Signed-off-by: Gerd Hoffmann ---- - ArmVirtPkg/ArmVirtPkg.dec | 6 ++ - .../PlatformBootManagerLib.inf | 3 + - .../PlatformBootManagerLib/PlatformBm.c | 64 +++++++++++++++++++ - 3 files changed, 73 insertions(+) - -diff --git a/ArmVirtPkg/ArmVirtPkg.dec b/ArmVirtPkg/ArmVirtPkg.dec -index 0f2d7873279f..6fa7ca22b966 100644 ---- a/ArmVirtPkg/ArmVirtPkg.dec -+++ b/ArmVirtPkg/ArmVirtPkg.dec -@@ -68,3 +68,9 @@ [PcdsFixedAtBuild, PcdsPatchableInModule] - # Cloud Hypervisor has no other way to pass Rsdp address to the guest except use a PCD. - # - gArmVirtTokenSpaceGuid.PcdCloudHvAcpiRsdpBaseAddress|0x0|UINT64|0x00000005 -+ -+ ## -+ # Whether the EFI memory attributes protocol should be uninstalled before -+ # invoking the OS loader. This may be needed to work around problematic -+ # builds of shim that use the protocol incorrectly. -+ gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol|FALSE|BOOLEAN|0x00000006 -diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf -index 997eb1a4429f..3a2822cda4b1 100644 ---- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf -+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf -@@ -46,6 +46,7 @@ [LibraryClasses] - PcdLib - PlatformBmPrintScLib - QemuBootOrderLib -+ QemuFwCfgSimpleParserLib - QemuLoadImageLib - ReportStatusCodeLib - TpmPlatformHierarchyLib -@@ -55,6 +56,7 @@ [LibraryClasses] - UefiRuntimeServicesTableLib - - [FixedPcd] -+ gArmVirtTokenSpaceGuid.PcdUninstallMemAttrProtocol - gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate - gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits - gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity -@@ -73,5 +75,6 @@ [Guids] - [Protocols] - gEfiFirmwareVolume2ProtocolGuid - gEfiGraphicsOutputProtocolGuid -+ gEfiMemoryAttributeProtocolGuid - gEfiPciRootBridgeIoProtocolGuid - gVirtioDeviceProtocolGuid -diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c -index 85c01351b09d..e9693a1cd9ac 100644 ---- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c -+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1111,6 +1112,49 @@ PlatformBootManagerBeforeConsole ( - FilterAndProcess (&gEfiPciIoProtocolGuid, IsVirtioPciSerial, SetupVirtioSerial); - } - -+/** -+ Uninstall the EFI memory attribute protocol if it exists. -+**/ -+STATIC -+VOID -+UninstallEfiMemoryAttributesProtocol ( -+ VOID -+ ) -+{ -+ EFI_STATUS Status; -+ EFI_HANDLE Handle; -+ UINTN Size; -+ VOID *MemoryAttributeProtocol; -+ -+ Size = sizeof (Handle); -+ Status = gBS->LocateHandle ( -+ ByProtocol, -+ &gEfiMemoryAttributeProtocolGuid, -+ NULL, -+ &Size, -+ &Handle -+ ); -+ -+ if (EFI_ERROR (Status)) { -+ ASSERT (Status == EFI_NOT_FOUND); -+ return; -+ } -+ -+ Status = gBS->HandleProtocol ( -+ Handle, -+ &gEfiMemoryAttributeProtocolGuid, -+ &MemoryAttributeProtocol -+ ); -+ ASSERT_EFI_ERROR (Status); -+ -+ Status = gBS->UninstallProtocolInterface ( -+ Handle, -+ &gEfiMemoryAttributeProtocolGuid, -+ MemoryAttributeProtocol -+ ); -+ ASSERT_EFI_ERROR (Status); -+} -+ - /** - Do the platform specific action after the console is ready - Possible things that can be done in PlatformBootManagerAfterConsole: -@@ -1129,12 +1173,32 @@ PlatformBootManagerAfterConsole ( - ) - { - RETURN_STATUS Status; -+ BOOLEAN Uninstall; - - // - // Show the splash screen. - // - BootLogoEnableLogo (); - -+ // -+ // Work around shim's terminally broken use of the EFI memory attributes -+ // protocol, by uninstalling it if requested on the QEMU command line. -+ // -+ // E.g., -+ // -fw_cfg opt/org.tianocore/UninstallMemAttrProtocol,string=y -+ // -+ Uninstall = FixedPcdGetBool (PcdUninstallMemAttrProtocol); -+ QemuFwCfgParseBool ("opt/org.tianocore/UninstallMemAttrProtocol", &Uninstall); -+ DEBUG (( -+ DEBUG_WARN, -+ "%a: %auninstalling EFI memory protocol\n", -+ __func__, -+ Uninstall ? "" : "not " -+ )); -+ if (Uninstall) { -+ UninstallEfiMemoryAttributesProtocol (); -+ } -+ - // - // Process QEMU's -kernel command line option. The kernel booted this way - // will receive ACPI tables: in PlatformBootManagerBeforeConsole(), we --- -2.43.0 - diff --git a/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch b/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch new file mode 100644 index 0000000..385781d --- /dev/null +++ b/0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch @@ -0,0 +1,61 @@ +From 2ddf7702dee6a1a0edab8154b085c36f8d84376f 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) +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: [12/19] fcadb6a747b65e4d449d48131c9a2eeed4bd3c9a +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the UDF driver. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + ArmVirtPkg/ArmVirtQemu.dsc | 1 - + ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 - + ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc +index 1e6c76795b..9216faca8d 100644 +--- a/ArmVirtPkg/ArmVirtQemu.dsc ++++ b/ArmVirtPkg/ArmVirtQemu.dsc +@@ -464,7 +464,6 @@ + MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + + # + # Bds +diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +index a814653dc4..a411a8f68d 100644 +--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc ++++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +@@ -83,7 +83,6 @@ READ_LOCK_STATUS = TRUE + INF MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf + INF FatPkg/EnhancedFatDxe/Fat.inf + INF MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf +- INF MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + + # + # Status Code Routing +diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc +index e48bdf8deb..66ad4b6948 100644 +--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc ++++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc +@@ -364,7 +364,6 @@ + MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf + MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf + FatPkg/EnhancedFatDxe/Fat.inf +- MdeModulePkg/Universal/Disk/UdfDxe/UdfDxe.inf + + # + # Bds diff --git a/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch b/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch new file mode 100644 index 0000000..074acd0 --- /dev/null +++ b/0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch @@ -0,0 +1,109 @@ +From 90b02d61d206926d6b2687a4a94f600039ae2e7c 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) +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: [13/19] cf9ef346386ac89fa05b29d429d8d1b27cf0e3b0 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the command to download files in the shell via TFTP. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + OvmfPkg/OvmfPkgIa32.dsc | 4 ---- + OvmfPkg/OvmfPkgIa32.fdf | 1 - + OvmfPkg/OvmfPkgIa32X64.dsc | 4 ---- + OvmfPkg/OvmfPkgIa32X64.fdf | 1 - + OvmfPkg/OvmfPkgX64.dsc | 4 ---- + OvmfPkg/OvmfPkgX64.fdf | 1 - + 6 files changed, 15 deletions(-) + +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index 62907e9458..c2fe2e6042 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -881,10 +881,6 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE +- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 6c324943e4..32a42c926b 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index 28cf5ace70..5d74007599 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -895,10 +895,6 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE +- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index a890d4a3e3..733f60ce7c 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index ca0c007181..f27932b38d 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -963,10 +963,6 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE +- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index 48da04eb9c..f562b5312b 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -317,7 +317,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif diff --git a/0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch b/0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch new file mode 100644 index 0000000..e6d8c20 --- /dev/null +++ b/0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch @@ -0,0 +1,54 @@ +From f7abc9b87c6034ada69ed16fc644c578cea5af19 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: [PATCH] ArmVirtPkg: Remove TftpDynamicCommand from shell (RHEL only) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +RH-Author: Philippe Mathieu-Daudé +RH-MergeRequest: 3: Disable features for RHEL9 +RH-Commit: [14/19] 12436014941bd4a7c99a26d779ebdcd75f169403 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the command to download files in the shell via TFTP. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + ArmVirtPkg/ArmVirt.dsc.inc | 7 +++---- + ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 - + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc +index 2bc6a29eb1..33f122f913 100644 +--- a/ArmVirtPkg/ArmVirt.dsc.inc ++++ b/ArmVirtPkg/ArmVirt.dsc.inc +@@ -388,10 +388,9 @@ + # + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + +- ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } ++ # ++ # UEFI application (Shell Embedded Boot Loader) ++ # + ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +index a411a8f68d..4b00524fde 100644 +--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc ++++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +@@ -99,7 +99,6 @@ READ_LOCK_STATUS = TRUE + INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + + INF ShellPkg/Application/Shell/Shell.inf +- INF ShellPkg/DynamicCommand/TftpDynamicCommand/TftpDynamicCommand.inf + INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf + INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf diff --git a/0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch b/0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch new file mode 100644 index 0000000..21da358 --- /dev/null +++ b/0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch @@ -0,0 +1,113 @@ +From ab3da1407691781fb148e53d4b02e996a5dbca2f 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) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rebase to edk2-stable202311: + +Minor update, context change due to new variable policy shell command. + +RH-Author: Philippe Mathieu-Daudé +RH-MergeRequest: 3: Disable features for RHEL9 +RH-Commit: [15/19] 1911cf04f27467ef1175b1976864c1111d93d19e +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the command to download files in the shell via HTTP(S). + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + OvmfPkg/OvmfPkgIa32.dsc | 4 ---- + OvmfPkg/OvmfPkgIa32.fdf | 1 - + OvmfPkg/OvmfPkgIa32X64.dsc | 4 ---- + OvmfPkg/OvmfPkgIa32X64.fdf | 1 - + OvmfPkg/OvmfPkgX64.dsc | 4 ---- + OvmfPkg/OvmfPkgX64.fdf | 1 - + 6 files changed, 15 deletions(-) + +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index c2fe2e6042..44139c648c 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -881,10 +881,6 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE +- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 32a42c926b..56520eaf99 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif + !if $(BUILD_SHELL) == TRUE +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index 5d74007599..e2f13499cc 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -895,10 +895,6 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE +- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index 733f60ce7c..f04620418b 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif + !if $(BUILD_SHELL) == TRUE +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index f27932b38d..f1dc48c3be 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -963,10 +963,6 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE +- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index f562b5312b..61a3c63166 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -317,7 +317,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif + !if $(BUILD_SHELL) == TRUE diff --git a/0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch b/0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch new file mode 100644 index 0000000..e039850 --- /dev/null +++ b/0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch @@ -0,0 +1,55 @@ +From 54c22fb545c567b4f99c81170ba8a4fc111e7646 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: [PATCH] ArmVirtPkg: Remove HttpDynamicCommand from shell (RHEL only) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rebase to edk2-stable202311: + +Minor update, context change due to new variable policy shell command. + +RH-Author: Philippe Mathieu-Daudé +RH-MergeRequest: 3: Disable features for RHEL9 +RH-Commit: [16/19] 07a74f1fdcdbb9a31d25ce9760edcd852e9574c3 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the command to download files in the shell via HTTP(S). + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + ArmVirtPkg/ArmVirt.dsc.inc | 4 ---- + ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 - + 2 files changed, 5 deletions(-) + +diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc +index 33f122f913..2b9315f8b3 100644 +--- a/ArmVirtPkg/ArmVirt.dsc.inc ++++ b/ArmVirtPkg/ArmVirt.dsc.inc +@@ -391,10 +391,6 @@ + # + # UEFI application (Shell Embedded Boot Loader) + # +- ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +index 4b00524fde..aa3acdeae6 100644 +--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc ++++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +@@ -99,7 +99,6 @@ READ_LOCK_STATUS = TRUE + INF OvmfPkg/VirtioSerialDxe/VirtioSerial.inf + + INF ShellPkg/Application/Shell/Shell.inf +- INF ShellPkg/DynamicCommand/HttpDynamicCommand/HttpDynamicCommand.inf + INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf + INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + diff --git a/0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch b/0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch new file mode 100644 index 0000000..b46d9e1 --- /dev/null +++ b/0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch @@ -0,0 +1,147 @@ +From 1025e8342c42c49d9b3bbffd6a923b4cb89ec76a 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) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rebase to edk2-stable202311: + +Minor update, context change due to new variable policy shell command. + +RH-Author: Philippe Mathieu-Daudé +RH-MergeRequest: 3: Disable features for RHEL9 +RH-Commit: [17/19] 491fe1301ea29c7cb56c20272e45614d5fcb6f14 +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the command to register a file in the shell as the +initial ramdisk for a UEFI stubbed kernel, to be booted next. + +Note: as further dynamic shell commands might show up upstream, +we intentionally preserve the empty !ifdef'ry context to ease +future downstream rebases. + +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 75bec7859e..753957bcc4 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.dsc ++++ b/OvmfPkg/AmdSev/AmdSevX64.dsc +@@ -737,10 +737,6 @@ + MdeModulePkg/Bus/Usb/UsbMassStorageDxe/UsbMassStorageDxe.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE +- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + !endif + OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf + OvmfPkg/AmdSev/Grub/Grub.inf +diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +index 5d0cba1e13..9b65ebac56 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.fdf ++++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +@@ -276,7 +276,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(TOOL_CHAIN_TAG) != "XCODE5" && $(BUILD_SHELL) == TRUE +-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif + INF OvmfPkg/AmdSev/SecretDxe/SecretDxe.inf + INF OvmfPkg/AmdSev/Grub/Grub.inf +diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc +index 44139c648c..2825acec3e 100644 +--- a/OvmfPkg/OvmfPkgIa32.dsc ++++ b/OvmfPkg/OvmfPkgIa32.dsc +@@ -885,10 +885,6 @@ + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } +- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + !endif + !if $(BUILD_SHELL) == TRUE + ShellPkg/Application/Shell/Shell.inf { +diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf +index 56520eaf99..de73cabb6e 100644 +--- a/OvmfPkg/OvmfPkgIa32.fdf ++++ b/OvmfPkg/OvmfPkgIa32.fdf +@@ -291,7 +291,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif + !if $(BUILD_SHELL) == TRUE + INF ShellPkg/Application/Shell/Shell.inf +diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc +index e2f13499cc..f1af88a9b5 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.dsc ++++ b/OvmfPkg/OvmfPkgIa32X64.dsc +@@ -899,10 +899,6 @@ + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } +- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + !endif + !if $(BUILD_SHELL) == TRUE + ShellPkg/Application/Shell/Shell.inf { +diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf +index f04620418b..241019cb28 100644 +--- a/OvmfPkg/OvmfPkgIa32X64.fdf ++++ b/OvmfPkg/OvmfPkgIa32X64.fdf +@@ -292,7 +292,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif + !if $(BUILD_SHELL) == TRUE + INF ShellPkg/Application/Shell/Shell.inf +diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc +index f1dc48c3be..908895354b 100644 +--- a/OvmfPkg/OvmfPkgX64.dsc ++++ b/OvmfPkg/OvmfPkgX64.dsc +@@ -967,10 +967,6 @@ + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } +- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + !endif + !if $(BUILD_SHELL) == TRUE + ShellPkg/Application/Shell/Shell.inf { +diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf +index 61a3c63166..c1e7240076 100644 +--- a/OvmfPkg/OvmfPkgX64.fdf ++++ b/OvmfPkg/OvmfPkgX64.fdf +@@ -317,7 +317,6 @@ INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResour + INF FatPkg/EnhancedFatDxe/Fat.inf + + !if $(BUILD_SHELL) == TRUE && $(TOOL_CHAIN_TAG) != "XCODE5" +-INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + !endif + !if $(BUILD_SHELL) == TRUE + INF ShellPkg/Application/Shell/Shell.inf diff --git a/0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch b/0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch new file mode 100644 index 0000000..8143b7a --- /dev/null +++ b/0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch @@ -0,0 +1,66 @@ +From 1e792bb790474a68c6e63a6e0faa88f8e2647ae3 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: [PATCH] ArmVirtPkg: Remove LinuxInitrdDynamicShellCommand (RHEL only) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Rebase to edk2-stable202311: + +Minor update, context change due to new variable policy shell command. + +RH-Author: Philippe Mathieu-Daudé +RH-MergeRequest: 3: Disable features for RHEL9 +RH-Commit: [18/19] 8f4e4007108462533e3d2050b84d8830073a7c0d +RH-Bugzilla: 1967747 +RH-Acked-by: Laszlo Ersek + +Remove the command to register a file in the shell as the initial +ramdisk for a UEFI stubbed kernel, to be booted next. + +Suggested-by: Laszlo Ersek +Signed-off-by: Philippe Mathieu-Daudé +Signed-off-by: Miroslav Rezanina +--- + ArmVirtPkg/ArmVirt.dsc.inc | 10 +++------- + ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 - + 2 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc +index 2b9315f8b3..5d40a3c3c7 100644 +--- a/ArmVirtPkg/ArmVirt.dsc.inc ++++ b/ArmVirtPkg/ArmVirt.dsc.inc +@@ -388,17 +388,13 @@ + # + MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf + +- # +- # UEFI application (Shell Embedded Boot Loader) +- # ++ # ++ # UEFI application (Shell Embedded Boot Loader) ++ # + ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf { + + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE + } +- OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf { +- +- gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE +- } + ShellPkg/Application/Shell/Shell.inf { + + ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.inf +diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +index aa3acdeae6..49bd633850 100644 +--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc ++++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +@@ -100,7 +100,6 @@ READ_LOCK_STATUS = TRUE + + INF ShellPkg/Application/Shell/Shell.inf + INF ShellPkg/DynamicCommand/VariablePolicyDynamicCommand/VariablePolicyDynamicCommand.inf +- INF OvmfPkg/LinuxInitrdDynamicShellCommand/LinuxInitrdDynamicShellCommand.inf + + # + # Bds diff --git a/0013-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch b/0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch similarity index 67% rename from 0013-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch rename to 0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch index efd19d2..9be80a7 100644 --- a/0013-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch +++ b/0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch @@ -1,21 +1,31 @@ -From eb24212304ec31c3ae8b878a21d4b875d5942cd1 Mon Sep 17 00:00:00 2001 +From d1572c35f13fd69f48c7c5adeb22eff09d3a1189 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Tue, 28 Feb 2023 15:47:00 +0100 -Subject: [PATCH 13/14] UefiCpuPkg/MpInitLib: fix apic mode for cpu hotplug +Subject: [PATCH] UefiCpuPkg/MpInitLib: fix apic mode for cpu hotplug + +RH-Author: Gerd Hoffmann +RH-MergeRequest: 42: UefiCpuPkg/MpInitLib: fix apic mode for cpu hotplug +RH-Bugzilla: 2124143 +RH-Acked-by: Laszlo Ersek +RH-Commit: [1/1] 5168501c31541a57aaeb3b3bd7c3602205eb7cdf (kraxel/centos-edk2) In case the number of CPUs can in increase beyond 255 due to CPU hotplug choose x2apic mode. Signed-off-by: Gerd Hoffmann + +patch_name: edk2-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch +present_in_specfile: true +location_in_specfile: 38 --- UefiCpuPkg/Library/MpInitLib/MpLib.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c -index 6f1456cfe168..9277e06c9b4a 100644 +index cdfb570e61..7bc93dfa13 100644 --- a/UefiCpuPkg/Library/MpInitLib/MpLib.c +++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c -@@ -527,7 +527,9 @@ CollectProcessorCount ( +@@ -533,7 +533,9 @@ CollectProcessorCount ( // // Enable x2APIC mode if // 1. Number of CPU is greater than 255; or @@ -26,7 +36,7 @@ index 6f1456cfe168..9277e06c9b4a 100644 // X2Apic = FALSE; if (CpuMpData->CpuCount > 255) { -@@ -535,6 +537,10 @@ CollectProcessorCount ( +@@ -541,6 +543,10 @@ CollectProcessorCount ( // If there are more than 255 processor found, force to enable X2APIC // X2Apic = TRUE; @@ -37,6 +47,3 @@ index 6f1456cfe168..9277e06c9b4a 100644 } else { CpuInfoInHob = (CPU_INFO_IN_HOB *)(UINTN)CpuMpData->CpuInfoInHob; for (Index = 0; Index < CpuMpData->CpuCount; Index++) { --- -2.41.0 - diff --git a/0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch b/0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch new file mode 100644 index 0000000..67afebf --- /dev/null +++ b/0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch @@ -0,0 +1,121 @@ +From 89a0a96bcfe49ca87087850d0b070e351850f6e8 Mon Sep 17 00:00:00 2001 +From: Oliver Steffen +Date: Wed, 16 Aug 2023 12:09:40 +0200 +Subject: [PATCH] OvmfPkg/AmdSevDxe: Shim Reboot workaround (RHEL only) + +RH-Author: Oliver Steffen +RH-MergeRequest: 46: OvmfPkg/AmdSevDxe: Shim Reboot workaround (RHEL only) +RH-Bugzilla: 2218196 +RH-Acked-by: Gerd Hoffmann +RH-Commit: [1/1] 9bf3bb989e36253aa34bf82ecfe8faa7312e8d22 (osteffen/edk2) + +Add a callback at the end of the Dxe phase that sets the +"FB_NO_REBOOT" variable under the Shim GUID. +This is a workaround for a boot loop in case a confidential +guest that uses shim is booted with a vtpm device present. + +BZ 2218196 + +Signed-off-by: Oliver Steffen + +patch_name: edk2-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch +present_in_specfile: true +location_in_specfile: 44 +--- + OvmfPkg/AmdSevDxe/AmdSevDxe.c | 42 +++++++++++++++++++++++++++++++++ + OvmfPkg/AmdSevDxe/AmdSevDxe.inf | 2 ++ + 2 files changed, 44 insertions(+) + +diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.c b/OvmfPkg/AmdSevDxe/AmdSevDxe.c +index db3675ae86..f639c093a2 100644 +--- a/OvmfPkg/AmdSevDxe/AmdSevDxe.c ++++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.c +@@ -19,6 +19,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -28,6 +29,10 @@ + // Present, initialized, tested bits defined in MdeModulePkg/Core/Dxe/DxeMain.h + #define EFI_MEMORY_INTERNAL_MASK 0x0700000000000000ULL + ++static EFI_GUID ShimLockGuid = { ++ 0x605dab50, 0xe046, 0x4300, { 0xab, 0xb6, 0x3d, 0xd8, 0x10, 0xdd, 0x8b, 0x23 } ++}; ++ + STATIC + EFI_STATUS + AllocateConfidentialComputingBlob ( +@@ -191,6 +196,32 @@ STATIC EDKII_MEMORY_ACCEPT_PROTOCOL mMemoryAcceptProtocol = { + AmdSevMemoryAccept + }; + ++VOID ++EFIAPI ++PopulateVarstore ( ++ EFI_EVENT Event, ++ VOID *Context ++ ) ++{ ++ EFI_SYSTEM_TABLE *SystemTable = (EFI_SYSTEM_TABLE *)Context; ++ EFI_STATUS Status; ++ ++ DEBUG ((DEBUG_INFO, "Populating Varstore\n")); ++ UINT32 data = 1; ++ ++ Status = SystemTable->RuntimeServices->SetVariable ( ++ L"FB_NO_REBOOT", ++ &ShimLockGuid, ++ EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_BOOTSERVICE_ACCESS, ++ sizeof (data), ++ &data ++ ); ++ ASSERT_EFI_ERROR (Status); ++ ++ Status = SystemTable->BootServices->CloseEvent (Event); ++ ASSERT_EFI_ERROR (Status); ++} ++ + EFI_STATUS + EFIAPI + AmdSevDxeEntryPoint ( +@@ -203,6 +234,7 @@ AmdSevDxeEntryPoint ( + UINTN NumEntries; + UINTN Index; + CONFIDENTIAL_COMPUTING_SNP_BLOB_LOCATION *SnpBootDxeTable; ++ EFI_EVENT PopulateVarstoreEvent; + + // + // Do nothing when SEV is not enabled +@@ -361,5 +393,15 @@ AmdSevDxeEntryPoint ( + ); + } + ++ Status = gBS->CreateEventEx ( ++ EVT_NOTIFY_SIGNAL, ++ TPL_CALLBACK, ++ PopulateVarstore, ++ SystemTable, ++ &gEfiEndOfDxeEventGroupGuid, ++ &PopulateVarstoreEvent ++ ); ++ ASSERT_EFI_ERROR (Status); ++ + return EFI_SUCCESS; + } +diff --git a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf +index e7c7d526c9..09cbd2b0ca 100644 +--- a/OvmfPkg/AmdSevDxe/AmdSevDxe.inf ++++ b/OvmfPkg/AmdSevDxe/AmdSevDxe.inf +@@ -54,6 +54,8 @@ + [Guids] + gConfidentialComputingSevSnpBlobGuid + gEfiEventBeforeExitBootServicesGuid ++ gEfiEndOfDxeEventGroupGuid ## CONSUMES ## Event ++ + + [Pcd] + gUefiOvmfPkgTokenSpaceGuid.PcdOvmfHostBridgePciDevId diff --git a/0015-CryptoPkg-CrtLib-add-stat.h.patch b/0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch similarity index 72% rename from 0015-CryptoPkg-CrtLib-add-stat.h.patch rename to 0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch index e1316b7..03f48e2 100644 --- a/0015-CryptoPkg-CrtLib-add-stat.h.patch +++ b/0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch @@ -1,9 +1,11 @@ -From c3f28ab099ea7c6949b849129cf5ea1c15b03854 Mon Sep 17 00:00:00 2001 +From 1b7a4cb54f50883fee087fd85b7c9b86b5296fea Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 28 Aug 2023 13:11:02 +0200 -Subject: [PATCH 15/16] CryptoPkg/CrtLib: add stat.h +Subject: [PATCH] CryptoPkg/CrtLib: add stat.h include file. -needed by rhel downstream openssl patches +Needed by rhel downstream openssl patches. + +Signed-off-by: Gerd Hoffmann --- CryptoPkg/Library/Include/sys/stat.h | 9 +++++++++ 1 file changed, 9 insertions(+) @@ -11,7 +13,7 @@ needed by rhel downstream openssl patches diff --git a/CryptoPkg/Library/Include/sys/stat.h b/CryptoPkg/Library/Include/sys/stat.h new file mode 100644 -index 000000000000..22247bb2db80 +index 0000000000..22247bb2db --- /dev/null +++ b/CryptoPkg/Library/Include/sys/stat.h @@ -0,0 +1,9 @@ @@ -24,6 +26,3 @@ index 000000000000..22247bb2db80 +**/ + +#include --- -2.41.0 - diff --git a/0016-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch b/0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch similarity index 78% rename from 0016-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch rename to 0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch index b2affa5..114aa05 100644 --- a/0016-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch +++ b/0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch @@ -1,17 +1,78 @@ -From dc0c929b8e17eefd7931ba21705eb0ec90c49714 Mon Sep 17 00:00:00 2001 +From e47e4f4efb118cf38f76c7abc8f1cb537e1f79e5 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Mon, 28 Aug 2023 13:27:09 +0200 -Subject: [PATCH 16/16] CryptoPkg/CrtLib: add access/open/read/write/close - syscalls +Subject: [PATCH] CryptoPkg/CrtLib: add access/open/read/write/close syscalls -needed by rhel downstream openssl patches +Needed by rhel downstream openssl patches, they use unix syscalls +for file access (instead of fopen + friends like the rest of the +code base). No actual file access is needed for edk2, so just +add stubs to make linking work. + +Signed-off-by: Gerd Hoffmann --- - CryptoPkg/Library/Include/CrtLibSupport.h | 41 +++++++++++++++++ .../Library/BaseCryptLib/SysCall/CrtWrapper.c | 46 +++++++++++++++++++ + CryptoPkg/Library/Include/CrtLibSupport.h | 41 +++++++++++++++++ 2 files changed, 87 insertions(+) +diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c +index 37cdecc9bd..dfdb635536 100644 +--- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c ++++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c +@@ -550,6 +550,52 @@ fread ( + return 0; + } + ++int ++access( ++ const char*, ++ int ++ ) ++{ ++ return -1; ++} ++ ++int ++open ( ++ const char *, ++ int ++ ) ++{ ++ return -1; ++} ++ ++ssize_t ++read ( ++ int, ++ void*, ++ size_t ++ ) ++{ ++ return -1; ++} ++ ++ssize_t ++write ( ++ int, ++ const void*, ++ size_t ++ ) ++{ ++ return -1; ++} ++ ++int ++close ( ++ int ++ ) ++{ ++ return -1; ++} ++ + uid_t + getuid ( + void diff --git a/CryptoPkg/Library/Include/CrtLibSupport.h b/CryptoPkg/Library/Include/CrtLibSupport.h -index f36fe08f0c61..7d98496af80b 100644 +index f36fe08f0c..7d98496af8 100644 --- a/CryptoPkg/Library/Include/CrtLibSupport.h +++ b/CryptoPkg/Library/Include/CrtLibSupport.h @@ -78,6 +78,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent @@ -76,63 +137,3 @@ index f36fe08f0c61..7d98496af80b 100644 time_t time ( time_t * -diff --git a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c -index 37cdecc9bd1d..dfdb63553667 100644 ---- a/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c -+++ b/CryptoPkg/Library/BaseCryptLib/SysCall/CrtWrapper.c -@@ -550,6 +550,52 @@ fread ( - return 0; - } - -+int -+access( -+ const char*, -+ int -+ ) -+{ -+ return -1; -+} -+ -+int -+open ( -+ const char *, -+ int -+ ) -+{ -+ return -1; -+} -+ -+ssize_t -+read ( -+ int, -+ void*, -+ size_t -+ ) -+{ -+ return -1; -+} -+ -+ssize_t -+write ( -+ int, -+ const void*, -+ size_t -+ ) -+{ -+ return -1; -+} -+ -+int -+close ( -+ int -+ ) -+{ -+ return -1; -+} -+ - uid_t - getuid ( - void --- -2.41.0 - diff --git a/0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch b/0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch new file mode 100644 index 0000000..2f036a7 --- /dev/null +++ b/0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch @@ -0,0 +1,194 @@ +From 9388cc72866fc379d94cf3dc029292f4246bfe39 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Tue, 30 Jan 2024 14:04:38 +0100 +Subject: [PATCH] OvmfPkg/Sec: Setup MTRR early in the boot process. + +RH-Author: Gerd Hoffmann +RH-MergeRequest: 55: OvmfPkg/Sec: Setup MTRR early in the boot process. +RH-Jira: RHEL-21704 +RH-Acked-by: Laszlo Ersek +RH-Commit: [1/4] c4061788d34f409944898b48642d610c259161f3 (kraxel.rh/centos-src-edk2) + +Specifically before running lzma uncompress of the main firmware volume. +This is needed to make sure caching is enabled, otherwise the uncompress +can be extremely slow. + +Adapt the ASSERTs and MTRR setup in PlatformInitLib to the changes. + +Background: Depending on virtual machine configuration kvm may uses EPT +memory types to apply guest MTRR settings. In case MTRRs are disabled +kvm will use the uncachable memory type for all mappings. The +vmx_get_mt_mask() function in the linux kernel handles this and can be +found here: + +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/x86/kvm/vmx/vmx.c?h=v6.7.1#n7580 + +In most VM configurations kvm uses MTRR_TYPE_WRBACK unconditionally. In +case the VM has a mdev device assigned that is not the case though. + +Before commit e8aa4c6546ad ("UefiCpuPkg/ResetVector: Cache Disable +should not be set by default in CR0") kvm also ended up using +MTRR_TYPE_WRBACK due to KVM_X86_QUIRK_CD_NW_CLEARED. After that commit +kvm evaluates guest mtrr settings, which why setting up MTRRs early is +important now. + +Reviewed-by: Laszlo Ersek +Signed-off-by: Gerd Hoffmann +Message-ID: <20240130130441.772484-2-kraxel@redhat.com> + +[ kraxel: Downstream-only for now. Timely upstream merge is unlikely + due to chinese holidays and rhel-9.4 deadlines are close. + QE regression testing passed. So go with upstream posted + series v3 ] + +patch_name: edk2-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch +present_in_specfile: true +location_in_specfile: 49 +--- + OvmfPkg/IntelTdx/Sec/SecMain.c | 32 +++++++++++++++++++++ + OvmfPkg/Library/PlatformInitLib/MemDetect.c | 10 +++---- + OvmfPkg/Sec/SecMain.c | 32 +++++++++++++++++++++ + 3 files changed, 69 insertions(+), 5 deletions(-) + +diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c b/OvmfPkg/IntelTdx/Sec/SecMain.c +index 42a587adfa..0daddac0a0 100644 +--- a/OvmfPkg/IntelTdx/Sec/SecMain.c ++++ b/OvmfPkg/IntelTdx/Sec/SecMain.c +@@ -27,6 +27,8 @@ + #include + #include + #include ++#include ++#include + + #define SEC_IDT_ENTRY_COUNT 34 + +@@ -48,6 +50,31 @@ IA32_IDT_GATE_DESCRIPTOR mIdtEntryTemplate = { + } + }; + ++// ++// Enable MTRR early, set default type to write back. ++// Needed to make sure caching is enabled, ++// without this lzma decompress can be very slow. ++// ++STATIC ++VOID ++SecMtrrSetup ( ++ VOID ++ ) ++{ ++ CPUID_VERSION_INFO_EDX Edx; ++ MSR_IA32_MTRR_DEF_TYPE_REGISTER DefType; ++ ++ AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &Edx.Uint32); ++ if (!Edx.Bits.MTRR) { ++ return; ++ } ++ ++ DefType.Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); ++ DefType.Bits.Type = 6; /* write back */ ++ DefType.Bits.E = 1; /* enable */ ++ AsmWriteMsr64 (MSR_IA32_MTRR_DEF_TYPE, DefType.Uint64); ++} ++ + VOID + EFIAPI + SecCoreStartupWithStack ( +@@ -204,6 +231,11 @@ SecCoreStartupWithStack ( + InitializeApicTimer (0, MAX_UINT32, TRUE, 5); + DisableApicTimerInterrupt (); + ++ // ++ // Initialize MTRR ++ // ++ SecMtrrSetup (); ++ + PeilessStartup (&SecCoreData); + + ASSERT (FALSE); +diff --git a/OvmfPkg/Library/PlatformInitLib/MemDetect.c b/OvmfPkg/Library/PlatformInitLib/MemDetect.c +index f042517bb6..313f5e1f7f 100644 +--- a/OvmfPkg/Library/PlatformInitLib/MemDetect.c ++++ b/OvmfPkg/Library/PlatformInitLib/MemDetect.c +@@ -1082,18 +1082,18 @@ PlatformQemuInitializeRam ( + MtrrGetAllMtrrs (&MtrrSettings); + + // +- // MTRRs disabled, fixed MTRRs disabled, default type is uncached ++ // See SecMtrrSetup(), default type should be write back + // +- ASSERT ((MtrrSettings.MtrrDefType & BIT11) == 0); ++ ASSERT ((MtrrSettings.MtrrDefType & BIT11) != 0); + ASSERT ((MtrrSettings.MtrrDefType & BIT10) == 0); +- ASSERT ((MtrrSettings.MtrrDefType & 0xFF) == 0); ++ ASSERT ((MtrrSettings.MtrrDefType & 0xFF) == MTRR_CACHE_WRITE_BACK); + + // + // flip default type to writeback + // +- SetMem (&MtrrSettings.Fixed, sizeof MtrrSettings.Fixed, 0x06); ++ SetMem (&MtrrSettings.Fixed, sizeof MtrrSettings.Fixed, MTRR_CACHE_WRITE_BACK); + ZeroMem (&MtrrSettings.Variables, sizeof MtrrSettings.Variables); +- MtrrSettings.MtrrDefType |= BIT11 | BIT10 | 6; ++ MtrrSettings.MtrrDefType |= BIT10; + MtrrSetAllMtrrs (&MtrrSettings); + + // +diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c +index 31da5d0ace..3b7dc7205d 100644 +--- a/OvmfPkg/Sec/SecMain.c ++++ b/OvmfPkg/Sec/SecMain.c +@@ -30,6 +30,8 @@ + #include + #include + #include ++#include ++#include + #include "AmdSev.h" + + #define SEC_IDT_ENTRY_COUNT 34 +@@ -744,6 +746,31 @@ FindAndReportEntryPoints ( + return; + } + ++// ++// Enable MTRR early, set default type to write back. ++// Needed to make sure caching is enabled, ++// without this lzma decompress can be very slow. ++// ++STATIC ++VOID ++SecMtrrSetup ( ++ VOID ++ ) ++{ ++ CPUID_VERSION_INFO_EDX Edx; ++ MSR_IA32_MTRR_DEF_TYPE_REGISTER DefType; ++ ++ AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &Edx.Uint32); ++ if (!Edx.Bits.MTRR) { ++ return; ++ } ++ ++ DefType.Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); ++ DefType.Bits.Type = 6; /* write back */ ++ DefType.Bits.E = 1; /* enable */ ++ AsmWriteMsr64 (MSR_IA32_MTRR_DEF_TYPE, DefType.Uint64); ++} ++ + VOID + EFIAPI + SecCoreStartupWithStack ( +@@ -942,6 +969,11 @@ SecCoreStartupWithStack ( + InitializeApicTimer (0, MAX_UINT32, TRUE, 5); + DisableApicTimerInterrupt (); + ++ // ++ // Initialize MTRR ++ // ++ SecMtrrSetup (); ++ + // + // Initialize Debug Agent to support source level debug in SEC/PEI phases before memory ready. + // diff --git a/0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch b/0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch new file mode 100644 index 0000000..e231544 --- /dev/null +++ b/0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch @@ -0,0 +1,41 @@ +From 625a70fc26d752b0025eae19682b386f44fa089b Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Tue, 30 Jan 2024 14:04:39 +0100 +Subject: [PATCH] MdePkg/ArchitecturalMsr.h: add #defines for MTRR cache types + +RH-Author: Gerd Hoffmann +RH-MergeRequest: 55: OvmfPkg/Sec: Setup MTRR early in the boot process. +RH-Jira: RHEL-21704 +RH-Acked-by: Laszlo Ersek +RH-Commit: [2/4] a568bc2793d677462a2971aae9566a9bbc64b063 (kraxel.rh/centos-src-edk2) + +Reviewed-by: Michael D Kinney +Reviewed-by: Laszlo Ersek +Signed-off-by: Gerd Hoffmann +Message-ID: <20240130130441.772484-3-kraxel@redhat.com> + +patch_name: edk2-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch +present_in_specfile: true +location_in_specfile: 50 +--- + MdePkg/Include/Register/Intel/ArchitecturalMsr.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/MdePkg/Include/Register/Intel/ArchitecturalMsr.h b/MdePkg/Include/Register/Intel/ArchitecturalMsr.h +index 756e7c86ec..08ba949cf7 100644 +--- a/MdePkg/Include/Register/Intel/ArchitecturalMsr.h ++++ b/MdePkg/Include/Register/Intel/ArchitecturalMsr.h +@@ -2103,6 +2103,13 @@ typedef union { + #define MSR_IA32_MTRR_PHYSBASE9 0x00000212 + /// @} + ++#define MSR_IA32_MTRR_CACHE_UNCACHEABLE 0 ++#define MSR_IA32_MTRR_CACHE_WRITE_COMBINING 1 ++#define MSR_IA32_MTRR_CACHE_WRITE_THROUGH 4 ++#define MSR_IA32_MTRR_CACHE_WRITE_PROTECTED 5 ++#define MSR_IA32_MTRR_CACHE_WRITE_BACK 6 ++#define MSR_IA32_MTRR_CACHE_INVALID_TYPE 7 ++ + /** + MSR information returned for MSR indexes #MSR_IA32_MTRR_PHYSBASE0 to + #MSR_IA32_MTRR_PHYSBASE9 diff --git a/0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch b/0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch new file mode 100644 index 0000000..f4128b3 --- /dev/null +++ b/0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch @@ -0,0 +1,70 @@ +From d545c8ac6a7c96cb64661b2f5b6fccb97f9c02f8 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Tue, 30 Jan 2024 14:04:40 +0100 +Subject: [PATCH] UefiCpuPkg/MtrrLib.h: use cache type #defines from + ArchitecturalMsr.h + +RH-Author: Gerd Hoffmann +RH-MergeRequest: 55: OvmfPkg/Sec: Setup MTRR early in the boot process. +RH-Jira: RHEL-21704 +RH-Acked-by: Laszlo Ersek +RH-Commit: [3/4] 8b766c97b247a8665662697534455c19423ff23c (kraxel.rh/centos-src-edk2) + +Reviewed-by: Michael D Kinney +Reviewed-by: Laszlo Ersek +Signed-off-by: Gerd Hoffmann +Message-ID: <20240130130441.772484-4-kraxel@redhat.com> + +patch_name: edk2-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch +present_in_specfile: true +location_in_specfile: 51 +--- + UefiCpuPkg/Include/Library/MtrrLib.h | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/UefiCpuPkg/Include/Library/MtrrLib.h b/UefiCpuPkg/Include/Library/MtrrLib.h +index 86cc1aab3b..287d249a99 100644 +--- a/UefiCpuPkg/Include/Library/MtrrLib.h ++++ b/UefiCpuPkg/Include/Library/MtrrLib.h +@@ -9,6 +9,8 @@ + #ifndef _MTRR_LIB_H_ + #define _MTRR_LIB_H_ + ++#include ++ + // + // According to IA32 SDM, MTRRs number and MSR offset are always consistent + // for IA32 processor family +@@ -82,20 +84,20 @@ typedef struct _MTRR_SETTINGS_ { + // Memory cache types + // + typedef enum { +- CacheUncacheable = 0, +- CacheWriteCombining = 1, +- CacheWriteThrough = 4, +- CacheWriteProtected = 5, +- CacheWriteBack = 6, +- CacheInvalid = 7 ++ CacheUncacheable = MSR_IA32_MTRR_CACHE_UNCACHEABLE, ++ CacheWriteCombining = MSR_IA32_MTRR_CACHE_WRITE_COMBINING, ++ CacheWriteThrough = MSR_IA32_MTRR_CACHE_WRITE_THROUGH, ++ CacheWriteProtected = MSR_IA32_MTRR_CACHE_WRITE_PROTECTED, ++ CacheWriteBack = MSR_IA32_MTRR_CACHE_WRITE_BACK, ++ CacheInvalid = MSR_IA32_MTRR_CACHE_INVALID_TYPE, + } MTRR_MEMORY_CACHE_TYPE; + +-#define MTRR_CACHE_UNCACHEABLE 0 +-#define MTRR_CACHE_WRITE_COMBINING 1 +-#define MTRR_CACHE_WRITE_THROUGH 4 +-#define MTRR_CACHE_WRITE_PROTECTED 5 +-#define MTRR_CACHE_WRITE_BACK 6 +-#define MTRR_CACHE_INVALID_TYPE 7 ++#define MTRR_CACHE_UNCACHEABLE MSR_IA32_MTRR_CACHE_UNCACHEABLE ++#define MTRR_CACHE_WRITE_COMBINING MSR_IA32_MTRR_CACHE_WRITE_COMBINING ++#define MTRR_CACHE_WRITE_THROUGH MSR_IA32_MTRR_CACHE_WRITE_THROUGH ++#define MTRR_CACHE_WRITE_PROTECTED MSR_IA32_MTRR_CACHE_WRITE_PROTECTED ++#define MTRR_CACHE_WRITE_BACK MSR_IA32_MTRR_CACHE_WRITE_BACK ++#define MTRR_CACHE_INVALID_TYPE MSR_IA32_MTRR_CACHE_INVALID_TYPE + + typedef struct { + UINT64 BaseAddress; diff --git a/0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch b/0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch new file mode 100644 index 0000000..dc32e31 --- /dev/null +++ b/0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch @@ -0,0 +1,49 @@ +From 77a0448486125a840a33e438e430d8e0844dab81 Mon Sep 17 00:00:00 2001 +From: Gerd Hoffmann +Date: Tue, 30 Jan 2024 14:04:41 +0100 +Subject: [PATCH] OvmfPkg/Sec: use cache type #defines from ArchitecturalMsr.h + +RH-Author: Gerd Hoffmann +RH-MergeRequest: 55: OvmfPkg/Sec: Setup MTRR early in the boot process. +RH-Jira: RHEL-21704 +RH-Acked-by: Laszlo Ersek +RH-Commit: [4/4] 55f00e3e153ca945ca458e7abc26780a8d83ac85 (kraxel.rh/centos-src-edk2) + +Reviewed-by: Laszlo Ersek +Signed-off-by: Gerd Hoffmann +Message-ID: <20240130130441.772484-5-kraxel@redhat.com> + +patch_name: edk2-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch +present_in_specfile: true +location_in_specfile: 52 +--- + OvmfPkg/IntelTdx/Sec/SecMain.c | 2 +- + OvmfPkg/Sec/SecMain.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/OvmfPkg/IntelTdx/Sec/SecMain.c b/OvmfPkg/IntelTdx/Sec/SecMain.c +index 0daddac0a0..c00b852f0e 100644 +--- a/OvmfPkg/IntelTdx/Sec/SecMain.c ++++ b/OvmfPkg/IntelTdx/Sec/SecMain.c +@@ -70,7 +70,7 @@ SecMtrrSetup ( + } + + DefType.Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); +- DefType.Bits.Type = 6; /* write back */ ++ DefType.Bits.Type = MSR_IA32_MTRR_CACHE_WRITE_BACK; + DefType.Bits.E = 1; /* enable */ + AsmWriteMsr64 (MSR_IA32_MTRR_DEF_TYPE, DefType.Uint64); + } +diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c +index 3b7dc7205d..aa0fa1b1ec 100644 +--- a/OvmfPkg/Sec/SecMain.c ++++ b/OvmfPkg/Sec/SecMain.c +@@ -766,7 +766,7 @@ SecMtrrSetup ( + } + + DefType.Uint64 = AsmReadMsr64 (MSR_IA32_MTRR_DEF_TYPE); +- DefType.Bits.Type = 6; /* write back */ ++ DefType.Bits.Type = MSR_IA32_MTRR_CACHE_WRITE_BACK; + DefType.Bits.E = 1; /* enable */ + AsmWriteMsr64 (MSR_IA32_MTRR_DEF_TYPE, DefType.Uint64); + } diff --git a/30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json b/30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json deleted file mode 100644 index e709223..0000000 --- a/30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "description": "OVMF with SB+SMM, SB enabled, MS certs enrolled", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "mode" : "split", - "executable": { - "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2", - "format": "qcow2" - }, - "nvram-template": { - "filename": "/usr/share/edk2/ovmf/OVMF_VARS_4M.secboot.qcow2", - "format": "qcow2" - } - }, - "targets": [ - { - "architecture": "x86_64", - "machines": [ - "pc-q35-*" - ] - } - ], - "features": [ - "acpi-s3", - "enrolled-keys", - "requires-smm", - "secure-boot", - "verbose-dynamic" - ], - "tags": [ - - ] -} diff --git a/30-edk2-ovmf-ia32-sb-enrolled.json b/30-edk2-ovmf-ia32-sb-enrolled.json deleted file mode 100644 index 33f970d..0000000 --- a/30-edk2-ovmf-ia32-sb-enrolled.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "description": "OVMF for i386, with SB+SMM, SB enabled, MS certs enrolled", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "mode" : "split", - "executable": { - "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd", - "format": "raw" - }, - "nvram-template": { - "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.secboot.fd", - "format": "raw" - } - }, - "targets": [ - { - "architecture": "i386", - "machines": [ - "pc-q35-*" - ] - } - ], - "features": [ - "acpi-s3", - "enrolled-keys", - "requires-smm", - "secure-boot", - "verbose-dynamic" - ], - "tags": [ - - ] -} diff --git a/31-edk2-ovmf-2m-raw-x64-sb-enrolled.json b/30-edk2-ovmf-x64-sb-enrolled.json similarity index 96% rename from 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json rename to 30-edk2-ovmf-x64-sb-enrolled.json index 2ed4536..d77ed08 100644 --- a/31-edk2-ovmf-2m-raw-x64-sb-enrolled.json +++ b/30-edk2-ovmf-x64-sb-enrolled.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd", "format": "raw" diff --git a/40-edk2-ovmf-4m-qcow2-x64-sb.json b/40-edk2-ovmf-4m-qcow2-x64-sb.json deleted file mode 100644 index 655dd42..0000000 --- a/40-edk2-ovmf-4m-qcow2-x64-sb.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "description": "OVMF with SB+SMM, empty varstore", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "mode" : "split", - "executable": { - "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2", - "format": "qcow2" - }, - "nvram-template": { - "filename": "/usr/share/edk2/ovmf/OVMF_VARS_4M.qcow2", - "format": "qcow2" - } - }, - "targets": [ - { - "architecture": "x86_64", - "machines": [ - "pc-q35-*" - ] - } - ], - "features": [ - "acpi-s3", - "requires-smm", - "secure-boot", - "verbose-dynamic" - ], - "tags": [ - - ] -} diff --git a/40-edk2-ovmf-ia32-sb.json b/40-edk2-ovmf-ia32-sb.json deleted file mode 100644 index 1e80e58..0000000 --- a/40-edk2-ovmf-ia32-sb.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "description": "OVMF for i386, with SB+SMM, empty varstore", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "mode" : "split", - "executable": { - "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd", - "format": "raw" - }, - "nvram-template": { - "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd", - "format": "raw" - } - }, - "targets": [ - { - "architecture": "i386", - "machines": [ - "pc-q35-*" - ] - } - ], - "features": [ - "acpi-s3", - "requires-smm", - "secure-boot", - "verbose-dynamic" - ], - "tags": [ - - ] -} diff --git a/41-edk2-ovmf-2m-raw-x64-sb.json b/40-edk2-ovmf-x64-sb.json similarity index 96% rename from 41-edk2-ovmf-2m-raw-x64-sb.json rename to 40-edk2-ovmf-x64-sb.json index 06b3ece..02a7622 100644 --- a/41-edk2-ovmf-2m-raw-x64-sb.json +++ b/40-edk2-ovmf-x64-sb.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd", "format": "raw" diff --git a/50-edk2-aarch64-qcow2.json b/50-edk2-aarch64-qcow2.json index 79f64a1..937d295 100644 --- a/50-edk2-aarch64-qcow2.json +++ b/50-edk2-aarch64-qcow2.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.qcow2", "format": "qcow2" diff --git a/50-edk2-arm-verbose.json b/50-edk2-arm-verbose.json deleted file mode 100644 index 52f9c2c..0000000 --- a/50-edk2-arm-verbose.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "description": "UEFI firmware for arm, verbose logs", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "mode" : "split", - "executable": { - "filename": "/usr/share/edk2/arm/QEMU_EFI-pflash.raw", - "format": "raw" - }, - "nvram-template": { - "filename": "/usr/share/edk2/arm/vars-template-pflash.raw", - "format": "raw" - } - }, - "targets": [ - { - "architecture": "arm", - "machines": [ - "virt-*" - ] - } - ], - "features": [ - "verbose-static" - ], - "tags": [ - - ] -} diff --git a/50-edk2-ovmf-4m-qcow2-x64-nosb.json b/50-edk2-ovmf-4m-qcow2-x64-nosb.json deleted file mode 100644 index d64735f..0000000 --- a/50-edk2-ovmf-4m-qcow2-x64-nosb.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "description": "OVMF without SB+SMM, empty varstore", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "mode" : "split", - "executable": { - "filename": "/usr/share/edk2/ovmf/OVMF_CODE_4M.qcow2", - "format": "qcow2" - }, - "nvram-template": { - "filename": "/usr/share/edk2/ovmf/OVMF_VARS_4M.qcow2", - "format": "qcow2" - } - }, - "targets": [ - { - "architecture": "x86_64", - "machines": [ - "pc-i440fx-*", - "pc-q35-*" - ] - } - ], - "features": [ - "acpi-s3", - "amd-sev", - "amd-sev-es", - "verbose-dynamic" - ], - "tags": [ - - ] -} diff --git a/50-edk2-ovmf-ia32-nosb.json b/50-edk2-ovmf-ia32-nosb.json deleted file mode 100644 index 544f824..0000000 --- a/50-edk2-ovmf-ia32-nosb.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "description": "OVMF for i386, without SB+SMM, empty varstore", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "mode" : "split", - "executable": { - "filename": "/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd", - "format": "raw" - }, - "nvram-template": { - "filename": "/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd", - "format": "raw" - } - }, - "targets": [ - { - "architecture": "i386", - "machines": [ - "pc-i440fx-*", - "pc-q35-*" - ] - } - ], - "features": [ - "acpi-s3", - "verbose-dynamic" - ], - "tags": [ - - ] -} diff --git a/50-edk2-ovmf-x64-microvm.json b/50-edk2-ovmf-x64-microvm.json deleted file mode 100644 index 3d5b393..0000000 --- a/50-edk2-ovmf-x64-microvm.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "description": "OVMF for microvm", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "memory", - "filename": "/usr/share/edk2/ovmf/MICROVM.fd" - }, - "targets": [ - { - "architecture": "x86_64", - "machines": [ - "microvm" - ] - } - ], - "features": [ - ], - "tags": [ - ] -} diff --git a/51-edk2-ovmf-2m-raw-x64-nosb.json b/50-edk2-ovmf-x64-nosb.json similarity index 92% rename from 51-edk2-ovmf-2m-raw-x64-nosb.json rename to 50-edk2-ovmf-x64-nosb.json index 050853e..c660e0c 100644 --- a/51-edk2-ovmf-2m-raw-x64-nosb.json +++ b/50-edk2-ovmf-x64-nosb.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd", "format": "raw" @@ -19,7 +19,6 @@ { "architecture": "x86_64", "machines": [ - "pc-i440fx-*", "pc-q35-*" ] } diff --git a/50-edk2-riscv-qcow2.json b/50-edk2-riscv-qcow2.json deleted file mode 100644 index eb1930d..0000000 --- a/50-edk2-riscv-qcow2.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "description": "UEFI firmware for RISC-V virtual machines", - "interface-types": [ - "uefi" - ], - "mapping": { - "device": "flash", - "mode" : "split", - "executable": { - "filename": "/usr/share/edk2/riscv/RISCV_VIRT_CODE.qcow2", - "format": "qcow2" - }, - "nvram-template": { - "filename": "/usr/share/edk2/riscv/RISCV_VIRT_VARS.qcow2", - "format": "qcow2" - } - }, - "targets": [ - { - "architecture": "riscv64", - "machines": [ - "virt", - "virt-*" - ] - } - ], - "features": [ - - ], - "tags": [ - - ] -} diff --git a/51-edk2-aarch64-raw.json b/51-edk2-aarch64-raw.json index cabbd39..506bbe6 100644 --- a/51-edk2-aarch64-raw.json +++ b/51-edk2-aarch64-raw.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw", "format": "raw" diff --git a/52-edk2-aarch64-verbose-qcow2.json b/52-edk2-aarch64-verbose-qcow2.json index 4173102..976f2a6 100644 --- a/52-edk2-aarch64-verbose-qcow2.json +++ b/52-edk2-aarch64-verbose-qcow2.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-pflash.qcow2", "format": "qcow2" diff --git a/53-edk2-aarch64-verbose-raw.json b/53-edk2-aarch64-verbose-raw.json index ec69d19..fa0ed91 100644 --- a/53-edk2-aarch64-verbose-raw.json +++ b/53-edk2-aarch64-verbose-raw.json @@ -5,7 +5,7 @@ ], "mapping": { "device": "flash", - "mode" : "split", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw", "format": "raw" diff --git a/DBXUpdate-20220812.ia32.bin b/DBXUpdate-20220812.ia32.bin deleted file mode 100644 index fbdb2709603b7f117553db9e06b47e7eeecf755a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6002 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 JG)!jye*hSo2}S?_ diff --git a/DBXUpdate-20220812.x64.bin b/DBXUpdate-20220812.x64.bin deleted file mode 100644 index ab95a63894dceea53ffef1c23d8f182bdb016c09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13778 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 EFAdOCwEzGB diff --git a/DBXUpdate-20230314.ia32.bin b/DBXUpdate-20230314.ia32.bin deleted file mode 100644 index 0d4b3356088769e8b33890148242b0ad7f9a193b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6098 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 ZZJ2FlLHT2MF0yMe{$!P+aq@QA{{U+TJ~;pY diff --git a/DBXUpdate-20230314.x64.bin b/DBXUpdate-20230314.x64.bin deleted file mode 100644 index e211fbcf72be9eba7fa23d2c60e41d91200f97ea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13922 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 D4)mrK diff --git a/DBXUpdate-20230509.ia32.bin b/DBXUpdate-20230509.ia32.bin deleted file mode 100644 index 6dbb7028d6d35cbfcc41ac1bf825fd85b6421dea..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7634 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 diff --git a/DBXUpdate-20230509.x64.bin b/DBXUpdate-20230509.x64.bin deleted file mode 100644 index e2f6b0259ae03528a2c84eacf0977f64bafef036..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21170 zcmd74byOT**QSlT1`QHCI5Y&;;10n81b26L_u%eMaCZsr79>a@xVt-H@_TKbsh;_|5avG{ z2v|sJ`i^GiHl|LtHY^w*w0|Ci$AVWfHnO(0F=BZKBKqeMBrF^`b3+GPM_UsoQW0AR zJ6i{RC-cA0paaqTvmY9Z?0>tTR7OmOR78lB6~w{m#ykyKSoT#8i2*qv0&&CpEW#?<(q4Nw3i z`M(~%zb61X01_SI@8d{N0g#XonciLWRIh1^gM&c`UE-giw{kLH+M~5Z-g5`Pz3*yw z823fr{mxeCC{#5|8EqqFV&6lkNSCfOL^)=ElIyQSkuh;|?;UY}LvukvLJ{N$Z#$Ua z_1h5Vs}6-9rhj@Gz+Bz)#DIcC>1y|4&9LX9>l}6lN9?`&bttw5zRl(-!Y1mIafqn zs?{kcLUVaf_?c|BeyM0U5aP#q`O=^Lw&%TGTK|=qg%YMPwbd`mZk>8n;&OyG4`xX% zVlNTv-orS)(VzDNjuFz1>kPwgs0gxttkB9*X`|r^urh-BJCrRnyAYmW_I29m4 z#Q!{s27?QO{YI_(tAdMo8>r&OBM|LkJ)O1?5+wG|ZcG>f5MLn=i0ePo4EeuHGu(fB z6&P47R904QZVncDb`Xe#ivvXRj|>G2J_y$j+u&JbB3Gbr%=FES=8|fK=Xg_uE=c(w zfCNSsBn^_x70(q75jJyjvg2W9c6D`Svi{GMW-_$3X1235x3zO*HgvFJ{+lR&ll*V) ziU|Faxw`-SU<7e6va&J#-3`)%L-_kfVPWARAz@TNN}x~wxebB}5&b{v8#_2T{(rxM z6A0y>u(2Q^Utyp?5dWHse~0qlT!e(svVbFDAdE*?4(1u*^Sf?r4rIh>V@%bR^GDY8 zT$^Fe!g`BPZz8-P8m!H*jIIiqR7NQ5D|Wo5?s!vEpR}Z%X_1V6>K6}r5;GC=?cZiNVeZ(}Bsq=yn=6m_O{iJE(I~H6<3DcfiTF9m81&J3#c=s0pL??!7i<(kp}y z%E%{vwyxm#RK~KHD3dC*a3`h7h5eS$y0QJ}Xxm5Hn;*ONBNJB;{F&bgR(?ah)@D#= zipVxGr{Za;lyDDH*N)?Wf)ot4pMDW;ntkTr%CvQIxRfDB-PnjDOWC*0mYNE(I0_r6 zK!S0uhe zzo+Q0@3H<*Q~4KPBvmmpcQ7LTr0?M5PAaGGU}@}RXQgjwOsZsS>-3Ki{M)*SzmL+>O;3oDKiWl>Vmf-@N^sw10E; zALj!x{{05A|NnD7X2XB6z5o6doB+cYI^gfYoC^xO!A``78l~fVqKhX&S;(Ef*jF+s zIn8f$_K1ZjV=Q#}a_HXN%4wnKiD7iRVRQ*)`u(ni(5-A~YC<1>5ztl9clp?l8ti2Y_$Oy)-4(fPcH51V`qUo2do>-vK5 z_R{|IcuojKVdz-#i@ML8xhYPZkN>4F)(&c91Yc;-(biiy9=)244~+$3)5dR+2=*$x3VQ-V<+*B^Q3tR?ZC|38I=GwmcKg=1 zC#ZwY5{1ubBV)ydc>M`Y7av44jK@$rULfKXuAOw^A9~pX3PyQ^v`m|4Z7OkZsZIWFBhDDiLLN%8J~*vi7_KI$vC`v>(2g zEa2kha^Ia*uWPZQh#XsHv}aM~$Xig2y>3^*xuHf6nq0Xm&YgHZLx=?Ek%#_-2EuOjz~KnwhHe= zBuoG#1h@DB6^cRt{EGQ(0Qc9R$ZqLh`S&QXD-C`b2eM&k{oj9m?vga*hFxs^fb=6a zop?FI1ll#gl6c%G?wSBq1<3~nf~}izq`Kr=oK26d=e9)zi1QI<-(^fxRx;d`p#GAV zR$<#=1WsC()359cC^1>nrA)X5F+t`9sn&6wHF_E=)-BoXN-}PWPb@8P`J;(|V2D^B z%j6c}TLT}cx24e!icV$mSKkqL4SFb>&gv{r>I~j=P7~8&li2F8S#_MijaKk6ZA_S%E`E$r+hz0)N24? z+aUXU-2NWfPw^isN`)Rc5=3Y!#Qtr{h5-Hj)tUb2ssYU^*QrNyy%*yqMNI?FEIk4a{^JzXF-GPR3c^g`cZALQ~p3;&x z$-BaaaMA-7&}`oSC{?1fipM0(pYtpcWY`G%QUun8HYN1iCTA#Xg;N;D96+$xxxBE#rs}tk- zi86`_kXL_7BsfdT*AS_H(xt-4T@&1vRUgqoYJmx*bv7$cu?OxaPty5Au=dRTvOnHX3v#&)cMJni6-QUf1PUL?cfiA{-~ z*BRgAM%y1uV`r_)UF;xfQ6L}tw1;Ls|KVel03M1N>vG);;yN`I^;#3Z)J&2?@wF_F z$FQw9oH~Ay2k|;x`{nwjZvOD2Pq2+1a+)N&!VNLY1oC+DJjj|NgT?UevmX^;+1~L_ zaT}OUCf+xqF;SHMibnzR^l4M?g_+|2aOif)^r2ECSY>a>c-X#*J~3OyLYk*>19>L9 zIMa~gJ4Z#5Z}=qT=)`u7YJ;pyr4)4~v#s=s)!sl}a55ujP2fCBMXBaNXWPHG`P|xx z$I;zhHQEl#Vp6~n$V-eP=u>aPrH8EZSe`M=VcZXVv9?_1AT#SDWZ0tnvIgYsFJo$&zx$yra(SoUQ**CsqrSNx-1ddLf^Dv-XqK=Mm)g?&w*?}L#!3ZM@8p{PwgQQ z!IwK4kI|eep3L%HezM*Vd#apA>++K%0`gTyRV<3sZyZmO%9u5$Bv-W<$2So{IU*NqZn_o?7;Dxp2f0$pXng6EDn;x?<>nT;Hf-^i*8>}Im1!BU?)nkIIo zXt+5Ggx?=^&RaZCy`?tqc>ec%a z7Bont@1N~&$-Jke+L(d*G9hL~bH*LN|CWPM&#%HT3S&R2CRv~DFiQmD^!9TQfqeMY z^zC+VAKL_M7Gl!Y#7j4imK%1$`g#O0@dN4XDcjAq!I2~EM z26~NVug2~hFh5zY&W5$-*W_vnRt8CTga!C?K-{CW4sE1Nbf}Y0uvh{0jjy_M34@?! z4O$(TQtxzh(%xC&+axG>(lc4^t`0*S19?r#=s14+V1E9hs^3xRG6NoQ_V3lW@Sb$X z7(?c>&X=`N&1VdX2 z3g~Yow*0TjIYD7K-D)y#dKW_fj0ggGlyx$QTQ8q`UHKD^7^p70crGM9iqW_i-?t*D zi8Uy1fqW874w?|>P;AYNi+$3Lt)rj!8=jT>+r2JExin&sZa9#K+9k6XJu`y*NK&MF z{C(+TZPDfD^pp4`eaM53(ktM5Je;EXHg}MgDjpX;|1MY)%B+m^$S` zTMdxUf~b<6^AH*eT#>vI?sn}`e?LW%fSQ!j99vA0!f8TC1Iu#dj92&g5 z!P}-q#@5Q#;z%kW6h3RbDFo_Yx>hS>ti(m^=M-r5)XTG_%EDBo7_&0))kvwyaeM-s zPf>eiosS64KDS=*w65xH9_RHdLa=Sdw%1$TBB^9hfX&x|>i(BSYK(Rojl+hY@KtHz z55x>?F?B~q;VbSs_tn7SXUH~DJkHaKx)#aBCVP*7k_|4R}hJFd zWVTBxG^UJJK90CRUSN`Xto~S(YkY^ImAe02cSTEshtp&^RaQsDL-01w63CmKin9)V zCo&lp2>+dMc={$0C%sFop?8SUdq^rhKUW0EZ_2QIQN^{FYkHb_UkBewI{TF4v5cDd9y|+}d+dFP3qv8VcE8~0{-Dul2 zwJ@Qx4!MsKH@&uM1sdNysr}wz%U87Z19>R5S9^3i-0kpsr-W`7m~RuM`m~EBFJ?1M z)rQ(N`lRL!+v@9LMySRL_=(kei-}W7p`U*9Yk%4>~BYXO{qPy@JvsPKm zR>?1xM7tseH752KBw>}l;E7e=&LY9n@^O8GF2A6kB&nlqRp!x^}IC( z*!i7x=>Bp2GIGO|O+xYf`P4y38t>}UkICX*3-;nZG7l`EzLq-dTZ`ZW&Tuh1yt#)X zGn!T}p|OnO*%gv;OkE`pu=x)9R+=_3BJBI?GPDjd;x|r|DU_v2%c*E16f$_0nDS7d zKJ20ojy;=-zO5$OLQr~Rk3C(B0u)=K+c6#2gIzZ^nBT%3X;#kIC{!6g6jG?Ko_XQ# zFm&s-`wp49>}C8=3QNuoIzS#paUs^W zKLJz9MY|*()0Qk6w_U{zDP8@JI7{M#I=};)FQ#V{+Lz zK8AS$9g~z|I*`Y91vM~Z{*e+qfNG+8mohV*!zvN79 z6pBuwzxoD;WH*q1K<$=ckwvG~w*Hn4sy6~^fMyu?E1n6p z{Hp|zryVa;kuLzvpGfqWE`P)%U?{A0^@SDvagO0($iiMA7u039CUUrEBx8L^ITA>zf5q>a~MZ*}=eg zIGARMNo&`k<7wWol-eR8O|3%dhb!+Ujhr#nwDmcE0^>bcb^^m#DjDF#CBiJM)-LgO zYun@((Vvl z*&pT<@@1p}s}DaS4O(k7*Cdv1Aww2-Lh`&4gVfLi_cWM=iNEV!x5WVUg@OY}tjje^ z*gW0x>2=eQob5)n628evM7Z+@w)LmNg7MR*wXWT)@_4_E)vkheSXWVQ2q4o%Eg{e9 z6+5W1T!Fk;sHNPZ{+uRHq942yl!tc17s0K9bv$4Oz#YWE&3q z@ECtM&AmO(%NHc+7sJXJ>;UVxXunGzYnS$hk}*?SgVM0uoSe74B|nAC{Bh#DC^TLP zw*J+h>@RTb(tzszQ?+Hs)|K+J!v+p#lZR-nZFlSDi4UwkG$cV#Yrq%dV2B+|MV7(n zZ=%`c|4!L-VD%~BCY-Ql+^|thd8$i*wdJSU)Ba`UFa3`qCkB?iB{)?efHsE-SfJ%`1`q)GqZawD&2i!)jgkFlMBg-a5A}BjGMvs}{RFqbz`~&q?V&SWil+QS0`Y4&<=%=b z_MfS%T+OVbD8SY)ZVe}+<-<#e0;HRGehgI&=h+km+_KW+Hlh1h%1JEfz<7M6#_JJT zd5Jt~i4sOsTZTl>^P9C;NThV|WA*GlK~MwvfQmNBpA=S8cgE?@*cx)DvGnr@Ocw=6 z$QhqPXr|b}##gwU8#hM`YwCF1mwhLuE6_r|N!qoB#Mes(dds?CNU(nOS7@mP1T})4 zGO`{lLrDr&c-E9fv&&fZIAhwg0n#(DdN?X!9>x5vhB3Cw&WgCq23_!@l3&veCh z^T-d$DX{t~*6`+OV8^3r)haOzTaR?Zq1NSRx!T-t4!Ry1-XF$I;QNg;wkSN4;^m^u zZGO)xxxG2BRx~Ub6^7EJ3F(N)`lJlTrx0PMbVX|p260#PM;RWqJeI$>$c^nY^Om}f z4o_JC`9wRn2QU5PJ} zTR{DkA_7EFQ3KSguZx3<3>C5I&MzV!8{0Fqw0pW~L%MtXRp?ih%woCZO@P^fNU`0lR?%kXgn*Z9Vy*)i zuaZ}qrMh1mUQReFBolX=i}#kq>SKwet-zJp?+^$UAfHjK;Id$OGhdR@)u}6-ktYYU z9x2&(8s(CJ6cF>u1-2f~q{*l~%JCAUmA!TKAWKQP}PEUID5 z{&B7*>anAvJ@;?8eYwrA!_tCEDV-bu#{XSJ`)-1!jLs{n;o09&Leq7p{3`y=(#z#h z(EMvN0a!fW?@V}i4&}NQ&1@*`-a*^SLO=OVm=+J1oFq;n_KSk~Rj+u8Mo*#-_H~o4 zL+MR@b)>D0gQrcu(4DIeoJ;*mYsmTjXH<%rQ0y%<3alr~aa_dYiUFp=4Zy{h3FK_!F3y91@l0Xmi}Xw|@qIn=vBQ84 zog8}#gr#bK_|c5wUU{`IL<8g((=n&5B%|h@I#h^d;2-ZzQB4pNC1ZAENV+cVTe>JkK$nciZ!URhQQF$jk!T38idTI@{Q!->-yxO?e@N;RV;JYTcG}0 zTt#rH!UW2bziOw~_s0tCmVr~pls^o^8bM;&OnG4S%(`N8*m2uQ5lDOp&Egg|CW)K@ zMqjO^zo)f#YEV~v2dKYg{cN8_hTXfBei#;%O(Ry$YHRDeCy%C_;iIxh!U5)=Td8r^ zksSjGEhiz90h1=SJ=mH#V=wgZZ9hsfu7|q1fcm?^wphOIX^bNZ`PZx|$E-6;-)ud1 z^|1%@1fF>(Zia#U;p^AnUW7I|O-n!Vn|TC0i3RtzU#@1mQa>bKGe}Ip*5jvvMJ7`E zh~E?}2DdTRAlhm3W7nZ@aI1JDC}^U6n84l!k~D*A-gjwnEL+IU zFYqe1RY(q|z<4eiZWVb^Riw?Luqu1w&PoPygi(rC>I9I#z&-k)BJczG%RFoLMiq0R z&~K<8N6lz8uCKHh)(=}=jP5GvT5o!#f&3N8oc_Q;62?ct5ijEW#nQ1&I}LBvwzZgf zOIIn~s6-%t9c{g6ADzUjm#@I^y%;HpY_-aCnMzpGn`e?w(R&H3|33_?$ET3Xc zfde!#kmoG){r2TczZi!?1UYym}mxALYt->}<=OTNJ<*Gq$qFHGUwaj#gIwOd&YNl7^i zpFTx-JX@{e&eMh5ghb?oabP?&VQv>pk(pLww~#~py7H-773f#bHNEnp*m3j%tt2== zo~dxmg5+K8?8-i)%FCwp2_A`7w+nKL4xXjl}zDj%UjFvmb z|FN-@oK;DAiTaaz*E>gf60#pHV@ zqaR`n6#DBr8xvstpZU|M=724$>L}y$Yqzis+^S0AONv=GTM46xjr{z=~O1!m*<}@H5=Rokyz@)LA*$?poKNzFHMy2|vO|oO?p*J$7 zoEs@vzkMa*)we8*0HR=v>8vX}1Eeulk5w2M@R%8uK=L!DDGR8drg0(}zhX#cr1m+wx)Iz^=#neGF>}FU^=xcExzvX-NjP^>})zht4*!4L~ z=iQ5H$-yL_uB5rBY{hFOGLV=3wH1$~$dCz37b)Eqo1C111ewx=4gF5msAw^D3=zx^ zHN!8;DA{xQ@t5kLr+piq3h!^=tu7u~=9gODlasT9U9X4ml}&o1hE@9pQGm=ufRSRW zrz&&1aTQfPKji}jNB$x(o^`!nh@T18QKxEMvTUM*%*^r*(p74ui+-5p(0rU6Tm$lw z*XnW`1INZFRJ(%|hFTktodNp3{Sb3F=t!p&stuz+zS_O^qmdqAcdEC9MD@EkY4WeI z^W>AipqmSC?Xdssfz7`In%nus6>8F1;ujkOvK6#5SreYIAGxya)!JG6HHc(^`Ui`S zW0R{KZ0m*fMly;U!@0SV)U@$KT#5o6$rAz}^nkp{4?h8_PfL5T0qGl!_c#*c8Be)nn!lYk9CrTGLz?*$$j4R<^rwAxDv|1$<`Ol$s-gc1-(@ux|^3k)~Je-3q9cF9U{2gA<+ox}kWs9p|^(S7~qIB`Q zRa>UysS$`uqH-e5ePhl`hd2AZar2d1wFkg>EYJePRhlK@lwiN!aTU1j(n@kUH7(Ek zpnm;8UH4pJ1mxdU%`-@M)G3LJY&Zy7RF1QJlfIsz(dNYpL+O_#UjX;o({RdzVU8PTkoid}3S?{?$*C6QDj7(t2A6s ztxCupNvbB0=g!G0p866Rn9SLzYtYUxSSnal?Ymd$(ol_FPdWnLuiyps?UquEHBT8g zazp99sU5~x5cRv%>KaS;d@&S+1B*xS;C}kuO2IRJ8U{?zs%-Dz`||oo$J8&PgkC(T z+@mVMc*GLb`lAWOP-Do0W1hH~N8Q?O+e@*JrlFtESKsxZ+q7%^CA5L9 zPpgPWBg(yGev=K9y)B@)N$JG@B&zLVu2mO@GTwM$2zLFhYqSts>=Id}s`%3nelPB3 zuSGf!>;SoeFGZpK-FLzT!1()Uec1a-&-%L+?JUY&XVTyAGNyB_Qdz$qx#pe@n}GG- zhMlV-q8ddB)a)HX(&Y#Dh%5F=oUiGa+Y1|+Y1z_Nf%?nuwDgtoqXe32s}C!soUV+e z2cN#XWQ8KNJDu#Zwt}s{mK!L?B4%}VgT)cwi}jmj=~0*Zo?H!72hk@vTu_^X^|v<& zm!B#mIO4uaxu(vaK*lJgyf3Z|msvNCB20R#97zt0XO|O#>ODDOACrWWYAth!0%@I> zsA)Qr+s=S>-s@zf5RkuKJe=>Nf`;XqMr-FjKU-l|s0QncOxXPKG8WRyi2NZiL+JK*R6nR3$ zlmX%s6#ln9@m4?{%c!|kx~^2feJ17Tb`lA6m*%5EyNz&$%B!t1DDN2y-zNkzz(iHVagXJfeUh~kat;~eFaS$(4NZoPKt3r)^S`HcQ z+>kS`pDi0uU*fLlD&S2>>7eVa)gQW`pQDLmwmnDt8>u#NCqKV_{{ZBb3P$BxDY}g! zx@GpQ))_l2c*=%ZC`@YMNVSh`81k2ZyqY<4ZwsnlI`1}OgQ)ZG69=jx+uyq9+42js zprX(ZML^z-LtJz1anJ0mYNf5D(ap13vCf?i3e9gzsNkORH2`e>^?*ujgU_$pGKzRc zt!8>rve0y4%N~Kdf7{L5i$~?c1=J6wQiBLbWEp5Ca9lgjE_$Q20Ci}5t@%-ku1)n#c*%pQLqxYQ*fby$Ho8%1!WHlXtIwks%b?$8?fn!QZwDdf z*S@MLy)|KsqN_OrHSF{_|5WBhU%ln5T zZy=xkKqa&*P|=|l)GoSg^3VkT9#28O$8B(u_3&2Wv?CwL7uNsTqMXrEe$r|P0j>D` z_SySNQ1LbDw3M3LJY|b_63CYZ?g^-Mo@0;XC$P|>?R#JOrVJBz^z&II2yT*QB7@EE z4Wys4P|fQS4Fwmf7&z)0rRKg^ga}-iiR58gV7~GF4Ah_eD!LK;SO%SxdC5wv=caPz z!(#KpmEUCHyAF~h95I-m>?0I#o|t2veI}wFZ5!>9FP`5-Z$?+aswJzSBIxKr0qP$N z5qkYBTthC5VknHZ5|1`^P`eW}f%M+i!9R7fSpbXw1!TY;jYizxR}AfUMz}UNKqBhc zqKC-2M7Acu+?8Pr)HgQxg3V8kmKU`AbK;3GJCk?GSUB-8zcqxWgIb^izY)m$!B9*# zZ#yTG6*D+wln;~qy}>By&Pa`1dLB}R-t+w&kcXzZ`~9X->FitSdY~iphZbEy`M}wP z&}U_Q!v^v@EwKI)^qLq1HJ=E6eDZmgqm=7#KrX^FtgT2NV(Sb$35z?}dIwHBvGovw z+k@_Rv&6=FO0?W=7oIY=YfNj63;HoXuRbsy#5?n3mY%4ZKDM|c89w8dOLvN|x&vF~ z$VJqg%boAR`r$}?qz-2aon0_G_%8dZ?GZnJBOu;dOpB6pfBV}_kBtWEBN@QMS6uSQ zTdlBrV5e~pv&`7xd z4E<3J$g?QdZ^5dmaL0+mF1bwERDSt{rt+hye4^}ma=JreT>;2*G*2{rmQ^293D>k{ zaJ-MAMd;`>=Y65#7VBi$I`!`W^4#SowCv&U&XPBqKeP`f5m#3d$Xb3vWz3-IQ)mBT z0akBFOF9<3Eht!JKV((2Uwdw6ImT8+l84GX|I<2QX8AQ9sQ)PxQ%EeG?6Hl%{g%I| zY&b-)V6ilu1fOYviN~o)0n9&DhL(Cm9P&UmA}7A5vyrsA(Z|&BiVw+;w1Q^OR!?t$ z`Z{$(W+HXU6&=UzK`t&SZ(<-&@Y%n*4YXab7o}N2gY^@P16IZ&K{|hs+pAZGW|E3a zx`@xYeF!3kI1Uga=#0Sf#}qVzxx0jcD2z(V+;o-rIRdUM<={#XG;}~$X8(cF3>c5C z@`UC!TWy9s_UIcg4O1oftkj(G)OK&LE1b`7kJ-Td*}e(#lvDhdy{m(Di-M+*R|=Ur zKVw*Bu;-Ook;0wjBT(OUVrs-lA;$0Zqt_~nMKAmB>B`c+rlPVW(Pc)X<{Ys4+zWBB z71^P=cl@FdYm2>iI$ztlJy__W1Gk}n)AE;@Dp21ySpqcG+%lOTw7HK##{5uoicjuq zBy8Jb*uQ{g(O<#Y9Aawb@46L`Nsx0`-qMTQJ{V(o(0aH zNhh3A^b&!-BoQy)s_|(OrV8}K>)>p@wa5=3|Fz+zD(w0?zQQWh-UN!n`l2F;Tqd}j zkz4AfYA^Hb2*}441}a$!a}8(?tj>fl^vt?oWMt_IBq(M7a_*l~R08Yo#eG7Yp2{+7 z-2oY`2Fx`htIwQc=W@Z0e>9?=rC54q2kPfyczl*mNX=A(QJ9V>(L8#ijzQ43bi09k z!9Zl}*g+5E3qUWsT5uk^$j-y4NFaFAKFA~I^{EW`&5!5v$ovD)K)zP0E;|5oQ8}Bw+P?kBZj=lo}L#skw}0 zG`rw7_S1RBj7*S>W*?#pHK4Xya*DfpUZG|0rh{SiBQ`+B_pGH3!)n9 zyIeU4%$)PYDn=ghS&`C*jbj7(!%T;s$q*eq(ehU{+l4oCYl4c{ETPJ0Q)ef3r|M=w zK>lKMwgN&^ZGMxf$TR!w&*C^U}zFT=;sg&60K5u!Y(H0e&yrPYbAz zg5nnF`_1$SM$vg;yl4y-97|X`f4fQ}CYdJqi;^jME1m&NtqcFp-8;cKKbMc=(cUPjtjVe-r`4w@I zAP<9=&gi$a_9Mc_aoDD&K**`xuG@|ewJ~`>{sZNwaP-WW zSDzj&<#@tN2kP?dTuU?}e{27oXtJqBT_DfvlDuZ%u?lL(=^U68ulmjt z+A8+P8@~}CuL4JMgBnL`%PhKB&sBBu^gU!vYFT@~P%*Bol;x%a?D~$nS?VClt8#|R z41X6x{5FQJg|pO#pz=(DU8Fl-DJmmS|BFOTEiv=b#NU4tGQHa+{bxy!AWz#uJLn1H zDn)f>mIBD@n08Sj6T{x#;>U)W6($ZKfy${g;q-IzgD{WYqnk1eM73ldS8*7%UeIw238L^T0CiAW{(U9vwqJsK)XkT?4sCXW@HO%R;#}7ag+vI zA34=$l3EYv5ltumOpBsTZmN{1QCt@oThQHMZnk{cE+@ zhW%v%-T+F6Qe*V<;wseC4{wt90x5FiX+ig&y;xS<7h?jDon8xQ?kBXKX zwsqlT-IW2Gf5#n@r~BY4pSQE^7JgkZBJ#vAA8l5^y0isz+HDXDfaTjH!Nc>U#dIdb zB84SI4c|SV2A_UVZh*;7%z>6wnH&}{o;kd37$q&wMrVpZ1GmWy(ianK_rNyChziJe zl;53q!R{yAoC+g4w@(rigN5;S@<&@p-$Z>u$4RJeKM$}g4Cw~z&+ILAb__;po@k)Z zHZzXWC%a}un$^-ttp0Fnxu|E3`3{WdA|=m0H@)d&Sw#P<_u6ovYe~*>{hxL0@>WFe zcr{J1>o2bhX3^gCU-?)*HsI{hwC|blsciDjguOCc>$|Zd#Bc-k#n4`dsYjK+xc}^b z6(A7Qmo0r`$r=BUG8-B<>X^m~)_*8JRicT1#Hb@jXqZ-k4AS=;3DwGm-eKoexOP$V zj*A59U#cLuioY~2EgkNzi3J5a(;uNv(Q0wbI4Tl~-AO`)0{Jv6V$~$=CyvyRj1@XN zG|O=pN;7*)tS`T4DmTq$5YQ!^!( zyd8VO3eq;zt5;?ho(Q&&K>ob`$J~IJo8RVAvqN-~%uHD0T)xe4 z;8k}bal~a-BG~=O`~D#&&Fk1r+W|2fK|{K7;xB{nb~6ql3k59s5F!fvyXCXDzlUUHu$B zn=2&2m>=}hK>g@dS5_Lia_NE~J*!;L&1{F46GX9;_XNyFj#APQqhR?z<(ut|h(VE; z*LO2^_q*b*HU_%zhr9kA4&0xtYp&>1pguhrR8H;(C2Qh|?9j@vgono5@X$VL!iW%i tGvig|C3PT=m3QTN@}z>-)XceA;BOW4Gju^N&>Xw2?quY}ssK&>e*iiP* - 20230301gitf80f052277c8-4 -- fix tpm detection. - -* Thu Apr 13 2023 Gerd Hoffmann - 20230301gitf80f052277c8-2 -- add StandaloneMM and ArmVirtQemuKernel builds. -- add json files for qcow2 images. -- update dbx files to 2023-03. - -* Mon Mar 06 2023 Gerd Hoffmann - 20230301gitf80f052277c8-1 -- update to edk2-stable202302 -- update dbx database to 20220812 -- add riscv64 sub-rpm - -* Fri Feb 17 2023 Gerd Hoffmann - 20221117gitfff6d81270b5-14 -- add sub-package with xen build (resolves: rhbz#2170730) - -* Sat Feb 11 2023 Gerd Hoffmann - 20221117gitfff6d81270b5-13 -- update openssl (CVE-2023-0286, CVE-2023-0215, CVE-2022-4450, CVE-2022-4304). - -* Wed Feb 08 2023 Gerd Hoffmann - 20221117gitfff6d81270b5-12 -- cherry-pick aarch64 bugfixes. -- set firmware build release date. -- add ext4 sub-package. - -* Thu Jan 19 2023 Fedora Release Engineering - 20221117gitfff6d81270b5-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jan 06 2023 Gerd Hoffmann - 20221117gitfff6d81270b5-10 -- add experimental builds with strict nx checking. - -* Mon Jan 02 2023 Gerd Hoffmann - 20221117gitfff6d81270b5-9 -- revert 'make files sparse again' (resolves: rhbz#2155673). -- pick up compiler + linker flags from rpm - -* Tue Dec 20 2022 Gerd Hoffmann - 20221117gitfff6d81270b5-8 -- make files sparse again - -* Thu Dec 15 2022 Gerd Hoffmann - 20221117gitfff6d81270b5-7 -- backport https://github.com/tianocore/edk2/pull/3770 - -* Mon Dec 12 2022 Gerd Hoffmann - 20221117gitfff6d81270b5-6 -- fix ovmf platform config (revert broken commit). -- show version information in smbios (backport). - -* Mon Dec 05 2022 Gerd Hoffmann - 20221117gitfff6d81270b5-5 -- rename *.json files to be more consistent. -- build script update - -* Fri Dec 02 2022 Gerd Hoffmann - 20221117gitfff6d81270b5-4 -- apply dbx updates - -* Tue Nov 29 2022 Gerd Hoffmann - 20221117gitfff6d81270b5-3 -- fix build script - -* Mon Nov 28 2022 Gerd Hoffmann - 20221117gitfff6d81270b5-2 -- add workaround for broken grub - -* Tue Sep 20 2022 Gerd Hoffmann - 20220826gitba0e0e4c6a17-1 -- update edk2 to 2022-08 stable tag. -- update openssl bundle to rhel-8.7 level. -- add stdvga fix. -- add 4MB firmware builds. - -* Thu Aug 18 2022 Gerd Hoffmann - 20220526git16779ede2d36-5 -- comment out patch #4 (bug 2116534 workaround) -- comment out patch #12 (bug 2114858 workaround) - -* Thu Jul 21 2022 Fedora Release Engineering - 20220526git16779ede2d36-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jun 10 2022 Gerd Hoffmann - 20220526git16779ede2d36-3 -- swap stack fix patch. - -* Wed Jun 08 2022 Gerd Hoffmann - 20220526git16779ede2d36-2 -- fix PcdResizeXterm patch. -- minor specfile cleanup. -- add 0021-OvmfPkg-Sec-fix-stack-switch.patch -- Resolves rhbz#2093745 - -* Tue May 31 2022 Gerd Hoffmann - 20220526git16779ede2d36-1 -- update to new edk2 stable tag (2022-05), refresh patches. -- add amdsev and inteltdx builds -- drop qosb - -* Tue Apr 19 2022 Gerd Hoffmann - 20220221gitb24306f15daa-4 -- switch to virt-firmware for secure boot key enrollment -- Stop builds on armv7 too (iasl missing). - -* Thu Apr 07 2022 Gerd Hoffmann - 20220221gitb24306f15daa-3 -- Fix TPM build options. -- Stop builds on i686 (iasl missing). -- Resolves rhbz#2072827 - -* Wed Mar 23 2022 Gerd Hoffmann - 20220221gitb24306f15daa-1 -- Update to edk2-stable202202 - -* Thu Jan 20 2022 Fedora Release Engineering - 20211126gitbb1bba3d7767-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Dec 6 2021 Gerd Hoffmann - 20211126gitbb1bba3d7767-1 -- Update to edk2-stable202111 -- Resolves rhbz#1978966 -- Resolves rhbz#2026744 - -* Mon Dec 6 2021 Daniel P. Berrangé - 20210527gite1999b264f1f-5 -- Drop glibc strcmp workaround - -* Mon Nov 29 2021 Daniel P. Berrangé - 20210527gite1999b264f1f-4 -- Drop customized splash screen boot logo -- Temporary workaround for suspected glibc strcmp bug breaking builds in koji - -* Wed Sep 1 2021 Daniel P. Berrangé - 20210527gite1999b264f1f-3 -- Fix qemu packaging conditionals for ELN builds - -* Wed Jul 21 2021 Fedora Release Engineering - 20210527gite1999b264f1f-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jul 20 2021 Cole Robinson - 20210527gite1999b264f1f-1 -- Update to git snapshot -- Sync with c9s packaging - -* Mon Jun 14 2021 Jiri Kucera - 20200801stable-5 -- Replace genisoimage with xorriso - -* Tue Jan 26 2021 Fedora Release Engineering - 20200801stable-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Thu Dec 03 2020 Cole Robinson - 20200801stable-3 -- Really fix TPM breakage (bz 1897367) - -* Tue Nov 24 2020 Cole Robinson - 20200801stable-2 -- Fix openssl usage, unbreak TPM (bz 1897367) - -* Wed Sep 16 2020 Cole Robinson - 20200801stable-1 -- Update to edk2 stable 202008 - -* Sat Sep 12 2020 Peter Robinson - 20200201stable-6 -- Tweaks for aarch64/ARMv7 builds -- Minor cleanups - -* Tue Aug 04 2020 Cole Robinson - 20200201stable-5 -- Fix build failures on rawhide - -* Sat Aug 01 2020 Fedora Release Engineering - 20200201stable-4 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 20200201stable-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 13 2020 Tom Stellard - 20200201stable-2 -- Use make macros -- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro - -* Mon Apr 13 2020 Cole Robinson - 20200201stable-1 -- Update to stable-202002 - -* Tue Jan 28 2020 Fedora Release Engineering - 20190501stable-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Sep 06 2019 Patrick Uiterwijk - 20190501stable-4 -- Updated HTTP_BOOT option to new upstream value - -* Wed Jul 24 2019 Fedora Release Engineering - 20190501stable-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jul 15 2019 Cole Robinson - 20190501stable-2 -- License is now BSD-2-Clause-Patent -- Re-enable secureboot enrollment -- Use qemu-ovmf-secureboot from git - -* Thu Jul 11 2019 Cole Robinson - 20190501stable-1 -- Update to stable-201905 -- Update to openssl-1.1.1b -- Ship VARS file for ovmf-ia32 (bug 1688596) -- Ship Fedora-variant JSON "firmware descriptor files" -- Resolves rhbz#1728652 - -* Mon Mar 18 2019 Cole Robinson - 20190308stable-1 -- Use YYYYMMDD versioning to fix upgrade path - -* Fri Mar 15 2019 Cole Robinson - 201903stable-1 -- Update to stable-201903 -- Update to openssl-1.1.0j -- Move to python3 deps - -* Thu Jan 31 2019 Fedora Release Engineering - 20180815gitcb5f4f45ce-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Wed Nov 14 2018 Patrick Uiterwijk - 20180815gitcb5f4f45ce-5 -- Add -qosb dependency on python3 - -* Fri Nov 9 2018 Paolo Bonzini - 20180815gitcb5f4f45ce-4 -- Fix network boot via grub (bz 1648476) - -* Wed Sep 12 2018 Paolo Bonzini - 20180815gitcb5f4f45ce-3 -- Explicitly compile the scripts using py_byte_compile - -* Fri Aug 31 2018 Cole Robinson - 20180815gitcb5f4f45ce-2 -- Fix passing through RPM build flags (bz 1540244) - -* Tue Aug 21 2018 Cole Robinson - 20180815gitcb5f4f45ce-1 -- Update to edk2 git cb5f4f45ce, edk2-stable201808 -- Update to qemu-ovmf-secureboot-1.1.3 -- Enable TPM2 support - -* Mon Jul 23 2018 Paolo Bonzini - 20180529gitee3198e672e2-5 -- Fixes for AMD SEV on OVMF_CODE.fd -- Add Provides for bundled OpenSSL - -* Wed Jul 18 2018 Paolo Bonzini - 20180529gitee3198e672e2-4 -- Enable IPv6 - -* Thu Jul 12 2018 Fedora Release Engineering - 20180529gitee3198e672e2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Jun 20 2018 Paolo Bonzini - 20180529gitee3198e672e2-2 -- Backport two bug fixes from RHEL: connect again virtio-rng devices, and - connect consoles unconditionally in OVMF (ARM firmware already did it) - -* Tue May 29 2018 Paolo Bonzini - 20180529gitee3198e672e2-1 -- Rebase to ee3198e672e2 - -* Tue May 01 2018 Cole Robinson - 20171011git92d07e4-7 -- Bump release for new build - -* Fri Mar 30 2018 Patrick Uiterwijk - 20171011git92d07e4-6 -- Add qemu-ovmf-secureboot (qosb) -- Generate pre-enrolled Secure Boot OVMF VARS files - -* Wed Mar 07 2018 Paolo Bonzini - 20171011git92d07e4-5 -- Fix GCC 8 compilation -- Replace dosfstools and mtools with qemu-img vvfat - -* Wed Feb 07 2018 Fedora Release Engineering - 20171011git92d07e4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Jan 19 2018 Paolo Bonzini - 20170209git296153c5-3 -- Add OpenSSL patches from Fedora -- Enable TLS_MODE - -* Fri Nov 17 2017 Paolo Bonzini - 20170209git296153c5-2 -- Backport patches 19-21 from RHEL -- Add patches 22-24 to fix SEV slowness -- Add fedora conditionals - -* Tue Nov 14 2017 Paolo Bonzini - 20171011git92d07e4-1 -- Import source and patches from RHEL version -- Update OpenSSL to 1.1.0e -- Refresh 0099-Tweak-the-tools_def-to-support-cross-compiling.patch - -* Mon Nov 13 2017 Paolo Bonzini - 20170209git296153c5-6 -- Allow non-cross builds -- Install /usr/share/OVMF and /usr/share/AAVMF - -* Wed Aug 02 2017 Fedora Release Engineering - 20170209git296153c5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 20170209git296153c5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed Mar 15 2017 Cole Robinson - 20170209git296153c5-3 -- Ship ovmf-ia32 package (bz 1424722) - -* Thu Feb 16 2017 Cole Robinson - 20170209git296153c5-2 -- Update EnrollDefaultKeys patch (bz #1398743) - -* Mon Feb 13 2017 Paolo Bonzini - 20170209git296153c5-1 -- Rebase to git master -- New patch 0010 fixes failure to build from source. - -* Fri Feb 10 2017 Fedora Release Engineering - 20161105git3b25ca8-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Sun Nov 06 2016 Cole Robinson - 20161105git3b25ca8-1 -- Rebase to git master - -* Fri Sep 9 2016 Tom Callaway - 20160418gita8c39ba-5 -- replace legally problematic openssl source with "hobbled" tarball - -* Thu Jul 21 2016 Gerd Hoffmann - 20160418gita8c39ba-4 -- Also build for armv7. - -* Tue Jul 19 2016 Gerd Hoffmann 20160418gita8c39ba-3 -- Update EnrollDefaultKeys patch. - -* Fri Jul 8 2016 Paolo Bonzini - 20160418gita8c39ba-2 -- Distribute edk2-ovmf on aarch64 - -* Sat May 21 2016 Cole Robinson - 20160418gita8c39ba-1 -- Distribute edk2-aarch64 on x86 (bz #1338027) - -* Mon Apr 18 2016 Gerd Hoffmann 20160418gita8c39ba-0 -- Update to latest git. -- Add firmware builds (FatPkg is free now). - -* Mon Feb 15 2016 Cole Robinson 20151127svn18975-3 -- Fix FTBFS gcc warning (bz 1307439) - -* Wed Feb 03 2016 Fedora Release Engineering - 20151127svn18975-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Nov 27 2015 Paolo Bonzini - 20151127svn18975-1 -- Rebase to 20151127svn18975-1 -- Linker script renamed to GccBase.lds - -* Wed Jun 17 2015 Fedora Release Engineering - 20150519svn17469-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue May 19 2015 Paolo Bonzini - 20150519svn17469-1 -- Rebase to 20150519svn17469-1 -- edk2-remove-tree-check.patch now upstream - -* Sat May 02 2015 Kalev Lember - 20140724svn2670-6 -- Rebuilt for GCC 5 C++11 ABI change - -* Sat Aug 16 2014 Fedora Release Engineering - 20140724svn2670-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jul 24 2014 Paolo Bonzini - 20140724svn2670-1 -- Rebase to 20140724svn2670-1 - -* Tue Jun 24 2014 Paolo Bonzini - 20140624svn2649-1 -- Use standalone .tar.xz from buildtools repo - -* Tue Jun 24 2014 Paolo Bonzini - 20140328svn15376-4 -- Install BuildTools/BaseEnv - -* Mon Jun 23 2014 Paolo Bonzini - 20140328svn15376-3 -- Rebase to get GCC48 configuration -- Package EDK_TOOLS_PATH as /usr/share/edk2 -- Package "build" and LzmaF86Compress too, as well as the new - tools Ecc and TianoCompress. - -* Sat Jun 07 2014 Fedora Release Engineering - 20131114svn14844-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Nov 14 2013 Paolo Bonzini - 20131114svn14844-1 -- Upgrade to r14844. -- Remove upstreamed parts of patch 1. - -* Fri Nov 8 2013 Paolo Bonzini - 20130515svn14365-7 -- Make BaseTools compile on ARM. - -* Fri Aug 30 2013 Paolo Bonzini - 20130515svn14365-6 -- Revert previous change; firmware packages should be noarch, and building - BaseTools twice is simply wrong. - -* Mon Aug 19 2013 Kay Sievers - 20130515svn14365-5 -- Add sub-package with EFI shell - -* Sat Aug 03 2013 Fedora Release Engineering - 20130515svn14365-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu May 23 2013 Dan Horák 20130515svn14365-3 -- set ExclusiveArch - -* Thu May 16 2013 Paolo Bonzini 20130515svn14365-2 -- Fix edk2-tools-python Requires - -* Wed May 15 2013 Paolo Bonzini 20130515svn14365-1 -- Split edk2-tools-doc and edk2-tools-python -- Fix Python BuildRequires -- Remove FatBinPkg at package creation time. -- Use fully versioned dependency. -- Add comment on how to generate the sources. - -* Thu May 2 2013 Paolo Bonzini 20130502.g732d199-1 -- Create. diff --git a/edk2-build.fedora b/edk2-build.fedora deleted file mode 100644 index e5c635e..0000000 --- a/edk2-build.fedora +++ /dev/null @@ -1,312 +0,0 @@ - -[opts.ovmf.common] -NETWORK_HTTP_BOOT_ENABLE = TRUE -NETWORK_IP6_ENABLE = TRUE -NETWORK_TLS_ENABLE = TRUE -NETWORK_ISCSI_ENABLE = TRUE -NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE -TPM2_ENABLE = TRUE -TPM2_CONFIG_ENABLE = TRUE -TPM1_ENABLE = TRUE -CAVIUM_ERRATUM_27456 = TRUE - -[opts.ovmf.4m] -FD_SIZE_4MB = TRUE - -[opts.ovmf.2m] -FD_SIZE_2MB = TRUE -NETWORK_ISCSI_ENABLE = FALSE -NETWORK_TLS_ENABLE = FALSE - -[opts.ovmf.sb.smm] -SECURE_BOOT_ENABLE = TRUE -SMM_REQUIRE = TRUE -# old downstream -EXCLUDE_SHELL_FROM_FD = TRUE -# new upstream -BUILD_SHELL = FALSE - -# requires edk2 2022-11 or newer -[opts.ovmf.sb.stateless] -SECURE_BOOT_ENABLE = TRUE -SMM_REQUIRE = FALSE - -[opts.armvirt.verbose] -DEBUG_PRINT_ERROR_LEVEL = 0x8040004F - -[opts.armvirt.silent] -DEBUG_PRINT_ERROR_LEVEL = 0x80000000 - -[opts.armvirt.sb.testonly] -SECURE_BOOT_ENABLE = TRUE - -[opts.armvirt.kernel] -TPM2_ENABLE = FALSE -TPM2_CONFIG_ENABLE = FALSE - - -[pcds.nx.strict] -PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD5 -PcdImageProtectionPolicy = 0x03 -PcdSetNxForStack = TRUE -# Default is FALSE, so there no need to actually set it. -#PcdUninstallMemAttrProtocol = FALSE - -[pcds.nx.broken.shim.grub] -# grub.efi uses EfiLoaderData for code -PcdDxeNxMemoryProtectionPolicy = 0xC000000000007FD1 -# shim.efi has broken MemAttr code -PcdUninstallMemAttrProtocol = TRUE - - -##################################################################### -# stateful ovmf builds (with vars in flash) - -[build.ovmf.2m.default] -desc = ovmf build (64-bit, 2MB) -conf = OvmfPkg/OvmfPkgX64.dsc -arch = X64 -opts = ovmf.common - ovmf.2m -plat = OvmfX64 -dest = Fedora/ovmf -cpy1 = FV/OVMF_CODE.fd -cpy2 = FV/OVMF_VARS.fd -cpy3 = X64/Shell.efi - -[build.ovmf.4m.default] -desc = ovmf build (64-bit, 4MB) -conf = OvmfPkg/OvmfPkgX64.dsc -arch = X64 -opts = ovmf.common - ovmf.4m -plat = OvmfX64 -dest = Fedora/ovmf -cpy1 = FV/OVMF_CODE.fd OVMF_CODE_4M.fd -cpy2 = FV/OVMF_VARS.fd OVMF_VARS_4M.fd - -[build.ovmf.2m.sb.smm] -desc = ovmf build (64-bit, 2MB, q35 only, needs smm, secure boot) -conf = OvmfPkg/OvmfPkgX64.dsc -arch = X64 -opts = ovmf.common - ovmf.2m - ovmf.sb.smm -plat = OvmfX64 -dest = Fedora/ovmf -cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd -cpy2 = X64/EnrollDefaultKeys.efi - -[build.ovmf.4m.sb.smm] -desc = ovmf build (64-bit, 4MB, q35 only, needs smm, secure boot) -conf = OvmfPkg/OvmfPkgX64.dsc -arch = X64 -opts = ovmf.common - ovmf.4m - ovmf.sb.smm -plat = OvmfX64 -dest = Fedora/ovmf -cpy1 = FV/OVMF_CODE.fd OVMF_CODE_4M.secboot.fd - - -##################################################################### -# stateless ovmf builds (firmware in rom or r/o flash) - -[build.ovmf.microvm] -desc = ovmf build for qemu microvm (2MB) -conf = OvmfPkg/Microvm/MicrovmX64.dsc -arch = X64 -opts = ovmf.common - ovmf.2m -plat = MicrovmX64 -dest = Fedora/ovmf -cpy1 = FV/MICROVM.fd - -[build.ovmf.xen] -desc = ovmf build for Xen -conf = OvmfPkg/OvmfXen.dsc -arch = X64 -opts = ovmf.common - ovmf.2m -plat = OvmfXen -dest = Fedora/xen -cpy1 = FV/OVMF.fd - -[build.ovmf.amdsev] -desc = ovmf build for AmdSev (2MB) -conf = OvmfPkg/AmdSev/AmdSevX64.dsc -arch = X64 -opts = ovmf.common - ovmf.2m -plat = AmdSev -dest = Fedora/ovmf -cpy1 = FV/OVMF.fd OVMF.amdsev.fd - -[build.ovmf.inteltdx] -desc = ovmf build for IntelTdx (2MB) -conf = OvmfPkg/IntelTdx/IntelTdxX64.dsc -arch = X64 -opts = ovmf.common - ovmf.2m - ovmf.sb.stateless -plat = IntelTdx -dest = Fedora/ovmf -cpy1 = FV/OVMF.fd OVMF.inteltdx.fd - - -##################################################################### -# armvirt builds - -[build.armvirt.aa64.verbose] -desc = ArmVirt build for qemu, 64-bit (arm v8), verbose -conf = ArmVirtPkg/ArmVirtQemu.dsc -arch = AARCH64 -opts = ovmf.common - armvirt.verbose -pcds = nx.broken.shim.grub -plat = ArmVirtQemu-AARCH64 -dest = Fedora/aarch64 -cpy1 = FV/QEMU_EFI.fd -cpy2 = FV/QEMU_VARS.fd -cpy3 = FV/QEMU_EFI.fd QEMU_EFI-pflash.raw -cpy4 = FV/QEMU_VARS.fd vars-template-pflash.raw -pad3 = QEMU_EFI-pflash.raw 64m -pad4 = vars-template-pflash.raw 64m - -[build.armvirt.aa64.silent] -desc = ArmVirt build for qemu, 64-bit (arm v8), silent -conf = ArmVirtPkg/ArmVirtQemu.dsc -arch = AARCH64 -opts = ovmf.common - armvirt.silent -pcds = nx.broken.shim.grub -plat = ArmVirtQemu-AARCH64 -dest = Fedora/aarch64 -cpy1 = FV/QEMU_EFI.fd QEMU_EFI.silent.fd -cpy2 = FV/QEMU_EFI.fd QEMU_EFI-silent-pflash.raw -pad2 = QEMU_EFI-silent-pflash.raw 64m - -[build.armvirt.aa64.kernel] -desc = ArmVirt build for qemu, 64-bit (arm v8) -conf = ArmVirtPkg/ArmVirtQemuKernel.dsc -arch = AARCH64 -opts = ovmf.common - armvirt.silent - armvirt.kernel -pcds = nx.broken.shim.grub -plat = ArmVirtQemuKernel-AARCH64 -dest = Fedora/aarch64 -cpy1 = FV/QEMU_EFI.fd QEMU_EFI.kernel.fd - - -##################################################################### -# riscv - -[build.riscv.qemu] -conf = OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc -arch = RISCV64 -plat = RiscVVirtQemu -dest = Fedora/riscv -cpy1 = FV/RISCV_VIRT_CODE.fd -cpy2 = FV/RISCV_VIRT_CODE.fd RISCV_VIRT_CODE.raw -cpy3 = FV/RISCV_VIRT_VARS.fd -cpy4 = FV/RISCV_VIRT_VARS.fd RISCV_VIRT_VARS.raw -pad1 = RISCV_VIRT_CODE.raw 32m -pad2 = RISCV_VIRT_VARS.raw 32m - - -##################################################################### -# 32-bit builds - -[build.ovmf.ia32.default] -desc = ovmf build (32-bit, 2MB) -conf = OvmfPkg/OvmfPkgIa32.dsc -arch = IA32 -opts = ovmf.common - ovmf.2m -plat = OvmfIa32 -dest = Fedora/ovmf-ia32 -cpy1 = FV/OVMF_CODE.fd -cpy2 = FV/OVMF_VARS.fd -cpy3 = IA32/Shell.efi - -[build.ovmf.ia32.sb.smm] -desc = ovmf build (32-bit, 2MB, q35 only, needs smm, secure boot) -conf = OvmfPkg/OvmfPkgIa32.dsc -arch = IA32 -opts = ovmf.common - ovmf.2m - ovmf.sb.smm -plat = OvmfIa32 -dest = Fedora/ovmf-ia32 -cpy1 = FV/OVMF_CODE.fd OVMF_CODE.secboot.fd -cpy2 = IA32/EnrollDefaultKeys.efi - -[build.armvirt.arm] -desc = ArmVirt build for qemu, 32-bit (arm v7) -conf = ArmVirtPkg/ArmVirtQemu.dsc -arch = ARM -opts = ovmf.common -pcds = nx.broken.shim.grub -plat = ArmVirtQemu-ARM -dest = Fedora/arm -cpy1 = FV/QEMU_EFI.fd -cpy2 = FV/QEMU_VARS.fd -cpy3 = FV/QEMU_EFI.fd QEMU_EFI-pflash.raw -cpy4 = FV/QEMU_VARS.fd vars-template-pflash.raw -pad3 = QEMU_EFI-pflash.raw 64m -pad4 = vars-template-pflash.raw 64m - - -##################################################################### -# experimental builds - -[build.ovmf.sb.stateless] -desc = ovmf build (64-bit, stateless secure boot) -conf = OvmfPkg/OvmfPkgX64.dsc -arch = X64 -opts = ovmf.common - ovmf.4m - ovmf.sb.stateless -plat = OvmfX64 -dest = Fedora/experimental -cpy1 = FV/OVMF.fd OVMF.stateless.fd - -[build.ovmf.strict.nx] -desc = ovmf build (64-bit, 4MB, q35 only, needs smm, secure boot, strict nx) -conf = OvmfPkg/OvmfPkgX64.dsc -arch = X64 -opts = ovmf.common - ovmf.4m - ovmf.sb.smm -pcds = nx.strict -plat = OvmfX64 -dest = Fedora/experimental -cpy1 = FV/OVMF_CODE.fd OVMF_CODE_4M.secboot.strictnx.fd - -[build.armvirt.aa64.strict.nx] -desc = ArmVirt build for qemu, 64-bit (arm v8), verbose -conf = ArmVirtPkg/ArmVirtQemu.dsc -arch = AARCH64 -opts = ovmf.common - armvirt.verbose -pcds = nx.strict -plat = ArmVirtQemu-AARCH64 -dest = Fedora/experimental -cpy1 = FV/QEMU_EFI.fd QEMU_EFI.strictnx.fd -cpy3 = FV/QEMU_EFI.fd QEMU_EFI-strictnx-pflash.raw -pad3 = QEMU_EFI-strictnx-pflash.raw 64m - -[build.armvirt.aa64.secboot.testonly] -desc = ArmVirt build for qemu, 64-bit (arm v8), secure boot -conf = ArmVirtPkg/ArmVirtQemu.dsc -arch = AARCH64 -opts = ovmf.common - armvirt.verbose - armvirt.sb.testonly -pcds = nx.strict -plat = ArmVirtQemu-AARCH64 -dest = Fedora/experimental -cpy1 = FV/QEMU_EFI.fd QEMU_EFI.secboot.testonly.fd -cpy3 = FV/QEMU_EFI.fd QEMU_EFI-secboot-testonly-pflash.raw -pad3 = QEMU_EFI-secboot-testonly-pflash.raw 64m diff --git a/edk2-build.fedora.platforms b/edk2-build.fedora.platforms deleted file mode 100644 index 59ad88e..0000000 --- a/edk2-build.fedora.platforms +++ /dev/null @@ -1,47 +0,0 @@ - -##################################################################### -# ext4 driver - -[build.ext4.x64] -desc = ext4 driver -conf = Features/Ext4Pkg/Ext4Pkg.dsc -arch = X64 -plat = Ext4Pkg -dest = Fedora/drivers -cpy1 = X64/Ext4Dxe.efi ext4x64.efi - -[build.ext4.aa64] -desc = ext4 driver -conf = Features/Ext4Pkg/Ext4Pkg.dsc -arch = AARCH64 -plat = Ext4Pkg -dest = Fedora/drivers -cpy1 = AARCH64/Ext4Dxe.efi ext4aa64.efi - -[build.ext4.riscv64] -desc = ext4 driver -conf = Features/Ext4Pkg/Ext4Pkg.dsc -arch = RISCV64 -plat = Ext4Pkg -dest = Fedora/drivers -cpy1 = RISCV64/Ext4Dxe.efi ext4riscv64.efi - - -##################################################################### -# arm standalone mm - -[build.standalone.mm.aa64] -conf = Platform/StandaloneMm/PlatformStandaloneMmPkg/PlatformStandaloneMmRpmb.dsc -arch = AARCH64 -plat = MmStandaloneRpmb -dest = Fedora/aarch64 -cpy1 = FV/BL32_AP_MM.fd - - -##################################################################### -# loongarch builds - -[build.loongarch] -desc = Loongarch build -conf = Platform/Loongson/LoongArchQemuPkg/Loongson.dsc -arch = LOONGARCH64 diff --git a/edk2.spec b/edk2.spec index c3bb221..dd3a764 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,29 +1,15 @@ -# https://fedoraproject.org/wiki/Changes/SetBuildFlagsBuildCheck -# breaks cross-building -%undefine _auto_set_build_flags +ExclusiveArch: x86_64 aarch64 -# actual firmware builds support cross-compiling. edk2-tools -# in theory should build everywhere without much trouble, but -# in practice the edk2 build system barfs on archs it doesn't know -# (such as ppc), so lets limit things to the known-good ones. -ExclusiveArch: x86_64 aarch64 riscv64 - -# edk2-stable202308 -%define GITDATE 20231122 -%define GITCOMMIT 8736b8fdca85 +# edk2-stable202402 +%define GITDATE 20240214 +%define GITCOMMIT edc6681206 %define TOOLCHAIN GCC -%define PLATFORMS_COMMIT 10e2eb030de3 - %define OPENSSL_VER 3.0.7 -%define OPENSSL_COMMIT db0287935122edceb91dcda8dfb53b4090734e22 +%define OPENSSL_HASH db0287935122edceb91dcda8dfb53b4090734e22 %define DBXDATE 20230509 -# Undefine this to get *HUGE* (50MB+) verbose build logs -%define silent --silent - -%if %{defined rhel} %define build_ovmf 0 %define build_aarch64 0 %ifarch x86_64 @@ -32,36 +18,21 @@ ExclusiveArch: x86_64 aarch64 riscv64 %ifarch aarch64 %define build_aarch64 1 %endif -%define build_riscv64 0 -%else -%define build_ovmf 1 -%define build_aarch64 1 -%define build_riscv64 1 -%endif - -%global softfloat_version 20180726-gitb64af41 -%define cross %{defined fedora} -%define disable_werror %{defined fedora} - Name: edk2 Version: %{GITDATE} -Release: %autorelease +Release: 1%{?dist} Summary: UEFI firmware for 64-bit virtual machines -License: Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-3-Clause AND BSD-4-Clause AND ISC AND MIT AND LicenseRef-Fedora-Public-Domain +License: BSD-2-Clause-Patent and Apache-2.0 and MIT URL: http://www.tianocore.org # The source tarball is created using following commands: -# COMMIT=bb1bba3d7767 +# COMMIT=ba91d0292e # git archive --format=tar --prefix=edk2-$COMMIT/ $COMMIT \ # | xz -9ev >/tmp/edk2-$COMMIT.tar.xz Source0: edk2-%{GITCOMMIT}.tar.xz Source1: ovmf-whitepaper-c770f8c.txt -Source2: openssl-rhel-%{OPENSSL_COMMIT}.tar.xz -Source3: softfloat-%{softfloat_version}.tar.xz -Source4: edk2-platforms-%{PLATFORMS_COMMIT}.tar.xz -Source5: jansson-2.13.1.tar.bz2 -Source6: README.experimental +Source2: openssl-rhel-%{OPENSSL_HASH}.tar.xz # json description files Source10: 50-edk2-aarch64-qcow2.json @@ -69,54 +40,48 @@ Source11: 51-edk2-aarch64-raw.json Source12: 52-edk2-aarch64-verbose-qcow2.json Source13: 53-edk2-aarch64-verbose-raw.json -Source20: 50-edk2-arm-verbose.json - -Source30: 30-edk2-ovmf-ia32-sb-enrolled.json -Source31: 40-edk2-ovmf-ia32-sb.json -Source32: 50-edk2-ovmf-ia32-nosb.json - -Source40: 30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json -Source41: 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json -Source42: 40-edk2-ovmf-4m-qcow2-x64-sb.json -Source43: 41-edk2-ovmf-2m-raw-x64-sb.json -Source44: 50-edk2-ovmf-x64-microvm.json -Source45: 50-edk2-ovmf-4m-qcow2-x64-nosb.json -Source46: 51-edk2-ovmf-2m-raw-x64-nosb.json -Source47: 60-edk2-ovmf-x64-amdsev.json -Source48: 60-edk2-ovmf-x64-inteltdx.json - -Source50: 50-edk2-riscv-qcow2.json +Source40: 30-edk2-ovmf-x64-sb-enrolled.json +Source41: 40-edk2-ovmf-x64-sb.json +Source43: 50-edk2-ovmf-x64-nosb.json +Source44: 60-edk2-ovmf-x64-amdsev.json +Source45: 60-edk2-ovmf-x64-inteltdx.json # https://gitlab.com/kraxel/edk2-build-config Source80: edk2-build.py -Source81: edk2-build.fedora -Source82: edk2-build.fedora.platforms -Source83: edk2-build.rhel-9 +Source82: edk2-build.rhel-9 Source90: DBXUpdate-%{DBXDATE}.x64.bin -Source91: DBXUpdate-%{DBXDATE}.ia32.bin - -Patch0001: 0001-BaseTools-do-not-build-BrotliCompress-RH-only.patch -Patch0002: 0002-MdeModulePkg-remove-package-private-Brotli-include-p.patch -Patch0003: 0003-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch -Patch0004: 0004-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch -Patch0005: 0005-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch -Patch0006: 0006-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch -Patch0007: 0007-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch -Patch0008: 0008-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch -Patch0009: 0009-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch -Patch0010: 0010-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch -Patch0011: 0011-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch -Patch0012: 0012-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch -Patch0013: 0013-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch -Patch0015: 0015-CryptoPkg-CrtLib-add-stat.h.patch -Patch0016: 0016-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch -Patch0017: 0017-OvmfPkg-set-PcdVariableStoreSize-PcdMaxVolatileVaria.patch -%if 0%{?fedora} >= 38 || 0%{?rhel} >= 10 -Patch0018: 0018-silence-.-has-a-LOAD-segment-with-RWX-permissions-wa.patch -%endif -Patch0019: 0019-ArmVirt-Allow-memory-attributes-protocol-to-be-disab.patch - +Patch1: 0003-Remove-paths-leading-to-submodules.patch +Patch2: 0004-MdeModulePkg-TerminalDxe-set-xterm-resolution-on-mod.patch +Patch3: 0005-OvmfPkg-take-PcdResizeXterm-from-the-QEMU-command-li.patch +Patch4: 0006-ArmVirtPkg-take-PcdResizeXterm-from-the-QEMU-command.patch +Patch5: 0007-OvmfPkg-enable-DEBUG_VERBOSE-RHEL-only.patch +Patch6: 0008-OvmfPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuVide.patch +Patch7: 0009-ArmVirtPkg-silence-DEBUG_VERBOSE-0x00400000-in-QemuR.patch +Patch8: 0010-OvmfPkg-QemuRamfbDxe-Do-not-report-DXE-failure-on-Aa.patch +Patch9: 0011-OvmfPkg-silence-EFI_D_VERBOSE-0x00400000-in-NvmExpre.patch +Patch10: 0012-OvmfPkg-QemuKernelLoaderFsDxe-suppress-error-on-no-k.patch +Patch11: 0013-SecurityPkg-Tcg2Dxe-suppress-error-on-no-swtpm-in-si.patch +Patch12: 0014-OvmfPkg-Remove-EbcDxe-RHEL-only.patch +Patch13: 0015-OvmfPkg-Remove-VirtioGpu-device-driver-RHEL-only.patch +Patch14: 0016-OvmfPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL-on.patch +Patch15: 0017-ArmVirtPkg-Remove-VirtioFsDxe-filesystem-driver-RHEL.patch +Patch16: 0018-OvmfPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +Patch17: 0019-ArmVirtPkg-Remove-UdfDxe-filesystem-driver-RHEL-only.patch +Patch18: 0020-OvmfPkg-Remove-TftpDynamicCommand-from-shell-RHEL-on.patch +Patch19: 0021-ArmVirtPkg-Remove-TftpDynamicCommand-from-shell-RHEL.patch +Patch20: 0022-OvmfPkg-Remove-HttpDynamicCommand-from-shell-RHEL-on.patch +Patch21: 0023-ArmVirtPkg-Remove-HttpDynamicCommand-from-shell-RHEL.patch +Patch22: 0024-OvmfPkg-Remove-LinuxInitrdDynamicShellCommand-RHEL-o.patch +Patch23: 0025-ArmVirtPkg-Remove-LinuxInitrdDynamicShellCommand-RHE.patch +Patch24: 0026-UefiCpuPkg-MpInitLib-fix-apic-mode-for-cpu-hotplug.patch +Patch25: 0027-OvmfPkg-AmdSevDxe-Shim-Reboot-workaround-RHEL-only.patch +Patch26: 0028-CryptoPkg-CrtLib-add-stat.h-include-file.patch +Patch27: 0029-CryptoPkg-CrtLib-add-access-open-read-write-close-sy.patch +Patch28: 0030-OvmfPkg-Sec-Setup-MTRR-early-in-the-boot-process.patch +Patch29: 0031-MdePkg-ArchitecturalMsr.h-add-defines-for-MTRR-cache.patch +Patch30: 0032-UefiCpuPkg-MtrrLib.h-use-cache-type-defines-from-Arc.patch +Patch31: 0033-OvmfPkg-Sec-use-cache-type-defines-from-Architectura.patch # python3-devel and libuuid-devel are required for building tools. # python3-devel is also needed for varstore template generation and @@ -125,15 +90,9 @@ BuildRequires: python3-devel BuildRequires: libuuid-devel BuildRequires: /usr/bin/iasl BuildRequires: binutils gcc git gcc-c++ make +BuildRequires: perl perl(JSON) BuildRequires: qemu-img -# openssl configure -BuildRequires: perl(FindBin) -BuildRequires: perl(IPC::Cmd) -BuildRequires: perl(File::Compare) -BuildRequires: perl(File::Copy) -BuildRequires: perl(JSON) - %if %{build_ovmf} # Only OVMF includes 80x86 assembly files (*.nasm*). BuildRequires: nasm @@ -144,21 +103,12 @@ BuildRequires: dosfstools BuildRequires: mtools BuildRequires: xorriso -# For generating the variable store template with the default certificates -# enrolled. -BuildRequires: python3-virt-firmware >= 23.5 +# secure boot enrollment +BuildRequires: python3dist(virt-firmware) >= 23.4 # endif build_ovmf %endif -%if %{cross} -BuildRequires: gcc-aarch64-linux-gnu -BuildRequires: gcc-arm-linux-gnu -BuildRequires: gcc-x86_64-linux-gnu -BuildRequires: gcc-riscv64-linux-gnu -%endif - - %package ovmf Summary: UEFI firmware for x86_64 virtual machines @@ -166,13 +116,10 @@ BuildArch: noarch Provides: OVMF = %{version}-%{release} Obsoletes: OVMF < 20180508-100.gitee3198e672e2.el7 -# need libvirt version with qcow2 support -Conflicts: libvirt-daemon-driver-qemu < 9.7.0 - # OVMF includes the Secure Boot and IPv6 features; it has a builtin OpenSSL # library. Provides: bundled(openssl) = %{OPENSSL_VER} -License: Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain +License: BSD-2-Clause-Patent and Apache-2.0 # URL taken from the Maintainers.txt file. URL: http://www.tianocore.org/ovmf/ @@ -190,11 +137,11 @@ Provides: AAVMF = %{version}-%{release} Obsoletes: AAVMF < 20180508-100.gitee3198e672e2.el7 # need libvirt version with qcow2 support -Conflicts: libvirt-daemon-driver-qemu < 9.7.0 +Conflicts: libvirt-daemon-driver-qemu < 9.2.0 # No Secure Boot for AAVMF yet, but we include OpenSSL for the IPv6 stack. Provides: bundled(openssl) = %{OPENSSL_VER} -License: Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain +License: BSD-2-Clause-Patent and Apache-2.0 # URL taken from the Maintainers.txt file. URL: https://github.com/tianocore/tianocore.github.io/wiki/ArmVirtPkg @@ -207,7 +154,7 @@ package contains a 64-bit build. %package tools Summary: EFI Development Kit II Tools -License: BSD-2-Clause-Patent AND LicenseRef-Fedora-Public-Domain +License: BSD-2-Clause-Patent URL: https://github.com/tianocore/tianocore.github.io/wiki/BaseTools %description tools This package provides tools that are needed to @@ -227,78 +174,6 @@ EDK II is a modern, feature-rich, cross-platform firmware development environment for the UEFI and PI specifications. This package contains sample 64-bit UEFI firmware builds for QEMU and KVM. - -%if %{defined fedora} -%package ovmf-ia32 -Summary: Open Virtual Machine Firmware -License: Apache-2.0 AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain -Provides: bundled(openssl) -BuildArch: noarch -%description ovmf-ia32 -EFI Development Kit II -Open Virtual Machine Firmware (ia32) - -%package ovmf-xen -Summary: Open Virtual Machine Firmware, Xen build -License: Apache-2.0 AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain -Provides: bundled(openssl) -BuildArch: noarch -%description ovmf-xen -EFI Development Kit II -Open Virtual Machine Firmware (Xen build) - -%package experimental -Summary: Open Virtual Machine Firmware, experimental builds -License: Apache-2.0 AND BSD-2-Clause-Patent AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain -Provides: bundled(openssl) -Obsoletes: edk2-ovmf-experimental < 20230825 -BuildArch: noarch -%description experimental -EFI Development Kit II -Open Virtual Machine Firmware (experimental builds) - -%package arm -Summary: ARM Virtual Machine Firmware -BuildArch: noarch -License: Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND BSD-3-Clause AND BSD-4-Clause AND ISC AND LicenseRef-Fedora-Public-Domain -%description arm -EFI Development Kit II -ARMv7 UEFI Firmware - -%package riscv64 -Summary: RISC-V Virtual Machine Firmware -BuildArch: noarch -License: Apache-2.0 AND (BSD-2-Clause OR GPL-2.0-or-later) AND BSD-2-Clause-Patent AND LicenseRef-Fedora-Public-Domain - -# need libvirt version with qcow2 support -Conflicts: libvirt-daemon-driver-qemu < 9.7.0 - -%description riscv64 -EFI Development Kit II -RISC-V UEFI Firmware - -%package ext4 -Summary: Ext4 filesystem driver -License: Apache-2.0 AND BSD-2-Clause-Patent -BuildArch: noarch -%description ext4 -EFI Development Kit II -Ext4 filesystem driver - -%package tools-python -Summary: EFI Development Kit II Tools -Requires: python3 -BuildArch: noarch - -%description tools-python -This package provides tools that are needed to build EFI executables -and ROMs using the GNU tools. You do not need to install this package; -you probably want to install edk2-tools only. -# endif fedora -%endif - - - %prep # We needs some special git config options that %%autosetup won't give us. # We init the git dir ourselves, then tell %%autosetup not to blow it away. @@ -311,32 +186,15 @@ git config am.keepcr true %autosetup -T -D -n edk2-%{GITCOMMIT} -S git_am cp -a -- %{SOURCE1} . +cp -a -- %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} . +cp -a -- %{SOURCE40} %{SOURCE41} %{SOURCE43} %{SOURCE44} %{SOURCE45} . +cp -a -- %{SOURCE80} %{SOURCE82} . +cp -a -- %{SOURCE90} . tar -C CryptoPkg/Library/OpensslLib -a -f %{SOURCE2} -x -# extract softfloat into place -tar -xf %{SOURCE3} --strip-components=1 --directory ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3/ -tar -xf %{SOURCE4} --strip-components=1 "*/Drivers" "*/Features" "*/Platform" "*/Silicon" -tar -xf %{SOURCE5} --strip-components=1 --directory RedfishPkg/Library/JsonLib/jansson -# include paths pointing to unused submodules -mkdir -p MdePkg/Library/MipiSysTLib/mipisyst/library/include -mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/include -mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/include/mbedtls -mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/library # Done by %setup, but we do not use it for the auxiliary tarballs chmod -Rf a+rX,u+w,g-w,o-w . -cp -a -- \ - %{SOURCE6} \ - %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} \ - %{SOURCE20} \ - %{SOURCE30} %{SOURCE31} %{SOURCE32} \ - %{SOURCE40} %{SOURCE41} %{SOURCE42} %{SOURCE43} %{SOURCE44} \ - %{SOURCE45} %{SOURCE46} %{SOURCE47} %{SOURCE48} \ - %{SOURCE50} \ - %{SOURCE80} %{SOURCE81} %{SOURCE82} %{SOURCE83} \ - %{SOURCE90} %{SOURCE91} \ - . - %build build_iso() { @@ -380,10 +238,15 @@ export RELEASE_DATE="$(echo %{GITDATE} | sed -e 's|\(....\)\(..\)\(..\)|\2/\3/\1 touch OvmfPkg/AmdSev/Grub/grub.efi # dummy python3 CryptoPkg/Library/OpensslLib/configure.py -%if %{build_ovmf} -%if %{defined rhel} +# include dirs of unused submodules +mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/include +mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/include/mbedtls +mkdir -p CryptoPkg/Library/MbedTlsLib/mbedtls/library -./edk2-build.py --config edk2-build.rhel-9 %{?silent} --release-date "$RELEASE_DATE" -m ovmf +%if %{build_ovmf} +./edk2-build.py --config edk2-build.rhel-9 -m ovmf --release-date "$RELEASE_DATE" +build_iso RHEL-9/ovmf +cp DBXUpdate-%{DBXDATE}.x64.bin RHEL-9/ovmf virt-fw-vars --input RHEL-9/ovmf/OVMF_VARS.fd \ --output RHEL-9/ovmf/OVMF_VARS.secboot.fd \ --set-dbx DBXUpdate-%{DBXDATE}.x64.bin \ @@ -391,93 +254,18 @@ virt-fw-vars --input RHEL-9/ovmf/OVMF_VARS.fd \ virt-fw-vars --input RHEL-9/ovmf/OVMF.inteltdx.fd \ --output RHEL-9/ovmf/OVMF.inteltdx.secboot.fd \ --set-dbx DBXUpdate-%{DBXDATE}.x64.bin \ - --enroll-redhat --secure-boot -build_iso RHEL-9/ovmf -cp DBXUpdate-%{DBXDATE}.x64.bin RHEL-9/ovmf - -%else - -./edk2-build.py --config edk2-build.fedora %{?silent} --release-date "$RELEASE_DATE" -m ovmf -./edk2-build.py --config edk2-build.fedora.platforms %{?silent} -m x64 -virt-fw-vars --input Fedora/ovmf/OVMF_VARS.fd \ - --output Fedora/ovmf/OVMF_VARS.secboot.fd \ - --set-dbx DBXUpdate-%{DBXDATE}.x64.bin \ - --enroll-redhat --secure-boot -virt-fw-vars --input Fedora/ovmf/OVMF_VARS_4M.fd \ - --output Fedora/ovmf/OVMF_VARS_4M.secboot.fd \ - --set-dbx DBXUpdate-%{DBXDATE}.x64.bin \ - --enroll-redhat --secure-boot -virt-fw-vars --input Fedora/ovmf/OVMF.inteltdx.fd \ - --output Fedora/ovmf/OVMF.inteltdx.secboot.fd \ - --set-dbx DBXUpdate-%{DBXDATE}.x64.bin \ - --enroll-redhat --secure-boot -virt-fw-vars --input Fedora/ovmf-ia32/OVMF_VARS.fd \ - --output Fedora/ovmf-ia32/OVMF_VARS.secboot.fd \ - --set-dbx DBXUpdate-%{DBXDATE}.ia32.bin \ - --enroll-redhat --secure-boot -build_iso Fedora/ovmf -build_iso Fedora/ovmf-ia32 -cp DBXUpdate-%{DBXDATE}.x64.bin Fedora/ovmf -cp DBXUpdate-%{DBXDATE}.ia32.bin Fedora/ovmf-ia32 - -for raw in */{ovmf,experimental}/*_4M*.fd; do - qcow2="${raw%.fd}.qcow2" - qemu-img convert -f raw -O qcow2 -o cluster_size=4096 -S 4096 "$raw" "$qcow2" - rm -f "$raw" -done - -# experimental stateless builds -virt-fw-vars --input Fedora/experimental/OVMF.stateless.fd \ - --output Fedora/experimental/OVMF.stateless.secboot.fd \ - --set-dbx DBXUpdate-%{DBXDATE}.x64.bin \ --enroll-redhat --secure-boot \ --set-fallback-no-reboot - -for image in \ - Fedora/ovmf/OVMF_CODE.secboot.fd \ - Fedora/ovmf/OVMF_CODE_4M.secboot.qcow2 \ - Fedora/experimental/OVMF.stateless.secboot.fd \ -; do - pcr="${image}" - pcr="${pcr%.fd}" - pcr="${pcr%.qcow2}" - pcr="${pcr}.pcr" - python3 /usr/share/doc/python3-virt-firmware/experimental/measure.py \ - --image "$image" \ - --version "%{name}-%{version}-%{release}" \ - --no-shim \ - > "$pcr" -done - -%endif %endif %if %{build_aarch64} -%if %{defined rhel} -./edk2-build.py --config edk2-build.rhel-9 %{?silent} --release-date "$RELEASE_DATE" -m armvirt -%else -./edk2-build.py --config edk2-build.fedora %{?silent} --release-date "$RELEASE_DATE" -m armvirt -./edk2-build.py --config edk2-build.fedora.platforms %{?silent} -m aa64 -virt-fw-vars --input Fedora/aarch64/vars-template-pflash.raw \ - --output Fedora/experimental/vars-template-secboot-testonly-pflash.raw \ - --enroll-redhat --secure-boot --distro-keys rhel -%endif +./edk2-build.py --config edk2-build.rhel-9 -m armvirt --release-date "$RELEASE_DATE" for raw in */aarch64/*.raw; do qcow2="${raw%.raw}.qcow2" qemu-img convert -f raw -O qcow2 -o cluster_size=4096 -S 4096 "$raw" "$qcow2" done %endif -%if %{build_riscv64} -./edk2-build.py --config edk2-build.fedora %{?silent} --release-date "$RELEASE_DATE" -m riscv -./edk2-build.py --config edk2-build.fedora.platforms %{?silent} -m riscv -for raw in */riscv/*.raw; do - qcow2="${raw%.raw}.qcow2" - qemu-img convert -f raw -O qcow2 -o cluster_size=4096 -S 4096 "$raw" "$qcow2" - rm -f "$raw" -done -%endif - %install cp -a OvmfPkg/License.txt License.OvmfPkg.txt @@ -499,113 +287,50 @@ install BaseTools/Conf/*.template \ install BaseTools/Scripts/GccBase.lds \ %{buildroot}%{_datadir}/%{name}/Scripts -# install firmware images mkdir -p %{buildroot}%{_datadir}/%{name} -%if %{defined rhel} cp -av RHEL-9/* %{buildroot}%{_datadir}/%{name} -%else -cp -av Fedora/* %{buildroot}%{_datadir}/%{name} -%endif - %if %{build_ovmf} - -# compat symlinks mkdir -p %{buildroot}%{_datadir}/OVMF -ln -s ../%{name}/ovmf/OVMF_CODE.fd %{buildroot}%{_datadir}/OVMF/ + ln -s ../%{name}/ovmf/OVMF_CODE.secboot.fd %{buildroot}%{_datadir}/OVMF/ ln -s ../%{name}/ovmf/OVMF_VARS.fd %{buildroot}%{_datadir}/OVMF/ ln -s ../%{name}/ovmf/OVMF_VARS.secboot.fd %{buildroot}%{_datadir}/OVMF/ ln -s ../%{name}/ovmf/UefiShell.iso %{buildroot}%{_datadir}/OVMF/ ln -s OVMF_CODE.fd %{buildroot}%{_datadir}/%{name}/ovmf/OVMF_CODE.cc.fd -# json description files -mkdir -p %{buildroot}%{_datadir}/qemu/firmware install -m 0644 \ - 30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json \ - 31-edk2-ovmf-2m-raw-x64-sb-enrolled.json \ - 40-edk2-ovmf-4m-qcow2-x64-sb.json \ - 41-edk2-ovmf-2m-raw-x64-sb.json \ - 50-edk2-ovmf-4m-qcow2-x64-nosb.json \ - 51-edk2-ovmf-2m-raw-x64-nosb.json \ + 30-edk2-ovmf-x64-sb-enrolled.json \ + 40-edk2-ovmf-x64-sb.json \ + 50-edk2-ovmf-x64-nosb.json \ 60-edk2-ovmf-x64-amdsev.json \ 60-edk2-ovmf-x64-inteltdx.json \ %{buildroot}%{_datadir}/qemu/firmware -%if %{defined fedora} -install -m 0644 \ - 50-edk2-ovmf-x64-microvm.json \ - 30-edk2-ovmf-ia32-sb-enrolled.json \ - 40-edk2-ovmf-ia32-sb.json \ - 50-edk2-ovmf-ia32-nosb.json \ - %{buildroot}%{_datadir}/qemu/firmware -%endif # endif build_ovmf %endif %if %{build_aarch64} - -# compat symlinks mkdir -p %{buildroot}%{_datadir}/AAVMF + ln -s ../%{name}/aarch64/QEMU_EFI-pflash.raw \ %{buildroot}%{_datadir}/AAVMF/AAVMF_CODE.verbose.fd ln -s ../%{name}/aarch64/QEMU_EFI-silent-pflash.raw \ %{buildroot}%{_datadir}/AAVMF/AAVMF_CODE.fd ln -s ../%{name}/aarch64/vars-template-pflash.raw \ %{buildroot}%{_datadir}/AAVMF/AAVMF_VARS.fd -%if %{defined fedora} -ln -s ../%{name}/arm/QEMU_EFI-pflash.raw \ - %{buildroot}%{_datadir}/AAVMF/AAVMF32_CODE.fd -%endif -# json description files install -m 0644 \ 50-edk2-aarch64-qcow2.json \ 51-edk2-aarch64-raw.json \ 52-edk2-aarch64-verbose-qcow2.json \ 53-edk2-aarch64-verbose-raw.json \ %{buildroot}%{_datadir}/qemu/firmware -%if %{defined fedora} -install -m 0644 \ - 50-edk2-arm-verbose.json \ - %{buildroot}%{_datadir}/qemu/firmware -%endif # endif build_aarch64 %endif -%if %{build_riscv64} - -install -m 0644 \ - 50-edk2-riscv-qcow2.json \ - %{buildroot}%{_datadir}/qemu/firmware - -# endif build_riscv64 -%endif - -%if %{defined fedora} - -# edk2-tools-python install -cp -R BaseTools/Source/Python %{buildroot}%{_datadir}/%{name}/Python -for i in build BPDG Ecc GenDepex GenFds GenPatchPcdTable PatchPcdValue TargetTool Trim UPT; do -echo '#!/bin/sh -export PYTHONPATH=%{_datadir}/%{name}/Python -exec python3 '%{_datadir}/%{name}/Python/$i/$i.py' "$@"' > %{buildroot}%{_bindir}/$i - chmod +x %{buildroot}%{_bindir}/$i -done - -%if 0%{?py_byte_compile:1} -# https://docs.fedoraproject.org/en-US/packaging-guidelines/Python_Appendix/#manual-bytecompilation -%py_byte_compile %{python3} %{buildroot}%{_datadir}/edk2/Python -%endif - -%endif - %check -for file in %{buildroot}%{_datadir}/%{name}/*/*VARS.secboot.fd; do - test -f "$file" || continue - virt-fw-vars --input $file --print | grep "SecureBootEnable.*ON" || exit 1 -done %global common_files \ %%license License.txt License.OvmfPkg.txt License-History.txt LICENSE.openssl \ @@ -619,11 +344,6 @@ done %doc OvmfPkg/README %doc ovmf-whitepaper-c770f8c.txt %dir %{_datadir}/OVMF/ -%{_datadir}/OVMF/OVMF_CODE.fd -%{_datadir}/OVMF/OVMF_CODE.secboot.fd -%{_datadir}/OVMF/OVMF_VARS.fd -%{_datadir}/OVMF/OVMF_VARS.secboot.fd -%{_datadir}/OVMF/UefiShell.iso %dir %{_datadir}/%{name}/ovmf/ %{_datadir}/%{name}/ovmf/OVMF_CODE.fd %{_datadir}/%{name}/ovmf/OVMF_CODE.cc.fd @@ -633,27 +353,19 @@ done %{_datadir}/%{name}/ovmf/OVMF.amdsev.fd %{_datadir}/%{name}/ovmf/OVMF.inteltdx.fd %{_datadir}/%{name}/ovmf/OVMF.inteltdx.secboot.fd +%{_datadir}/%{name}/ovmf/DBXUpdate*.bin %{_datadir}/%{name}/ovmf/UefiShell.iso +%{_datadir}/OVMF/OVMF_CODE.secboot.fd +%{_datadir}/OVMF/OVMF_VARS.fd +%{_datadir}/OVMF/OVMF_VARS.secboot.fd +%{_datadir}/OVMF/UefiShell.iso %{_datadir}/%{name}/ovmf/Shell.efi %{_datadir}/%{name}/ovmf/EnrollDefaultKeys.efi -%{_datadir}/%{name}/ovmf/DBXUpdate*.bin -%{_datadir}/qemu/firmware/30-edk2-ovmf-4m-qcow2-x64-sb-enrolled.json -%{_datadir}/qemu/firmware/31-edk2-ovmf-2m-raw-x64-sb-enrolled.json -%{_datadir}/qemu/firmware/40-edk2-ovmf-4m-qcow2-x64-sb.json -%{_datadir}/qemu/firmware/41-edk2-ovmf-2m-raw-x64-sb.json -%{_datadir}/qemu/firmware/50-edk2-ovmf-4m-qcow2-x64-nosb.json -%{_datadir}/qemu/firmware/51-edk2-ovmf-2m-raw-x64-nosb.json +%{_datadir}/qemu/firmware/30-edk2-ovmf-x64-sb-enrolled.json +%{_datadir}/qemu/firmware/40-edk2-ovmf-x64-sb.json +%{_datadir}/qemu/firmware/50-edk2-ovmf-x64-nosb.json %{_datadir}/qemu/firmware/60-edk2-ovmf-x64-amdsev.json %{_datadir}/qemu/firmware/60-edk2-ovmf-x64-inteltdx.json -%if %{defined fedora} -%{_datadir}/%{name}/ovmf/MICROVM.fd -%{_datadir}/qemu/firmware/50-edk2-ovmf-x64-microvm.json -%{_datadir}/%{name}/ovmf/OVMF_CODE_4M.qcow2 -%{_datadir}/%{name}/ovmf/OVMF_CODE_4M.secboot.qcow2 -%{_datadir}/%{name}/ovmf/OVMF_VARS_4M.qcow2 -%{_datadir}/%{name}/ovmf/OVMF_VARS_4M.secboot.qcow2 -%{_datadir}/%{name}/ovmf/*.pcr -%endif # endif build_ovmf %endif @@ -661,20 +373,16 @@ done %files aarch64 %common_files %dir %{_datadir}/AAVMF/ -%{_datadir}/AAVMF/AAVMF_CODE.verbose.fd -%{_datadir}/AAVMF/AAVMF_CODE.fd -%{_datadir}/AAVMF/AAVMF_VARS.fd %dir %{_datadir}/%{name}/aarch64/ %{_datadir}/%{name}/aarch64/QEMU_EFI-pflash.* %{_datadir}/%{name}/aarch64/QEMU_EFI-silent-pflash.* %{_datadir}/%{name}/aarch64/vars-template-pflash.* +%{_datadir}/AAVMF/AAVMF_CODE.verbose.fd +%{_datadir}/AAVMF/AAVMF_CODE.fd +%{_datadir}/AAVMF/AAVMF_VARS.fd %{_datadir}/%{name}/aarch64/QEMU_EFI.fd %{_datadir}/%{name}/aarch64/QEMU_EFI.silent.fd %{_datadir}/%{name}/aarch64/QEMU_VARS.fd -%if %{defined fedora} -%{_datadir}/%{name}/aarch64/BL32_AP_MM.fd -%{_datadir}/%{name}/aarch64/QEMU_EFI.kernel.fd -%endif %{_datadir}/qemu/firmware/50-edk2-aarch64-qcow2.json %{_datadir}/qemu/firmware/51-edk2-aarch64-raw.json %{_datadir}/qemu/firmware/52-edk2-aarch64-verbose-qcow2.json @@ -706,78 +414,8 @@ done %doc BaseTools/UserManuals/*.rtf -%if %{defined fedora} -%if %{build_ovmf} -%files ovmf-ia32 -%common_files -%dir %{_datadir}/%{name}/ovmf-ia32 -%{_datadir}/%{name}/ovmf-ia32/EnrollDefaultKeys.efi -%{_datadir}/%{name}/ovmf-ia32/OVMF_CODE.fd -%{_datadir}/%{name}/ovmf-ia32/OVMF_CODE.secboot.fd -%{_datadir}/%{name}/ovmf-ia32/OVMF_VARS.fd -%{_datadir}/%{name}/ovmf-ia32/OVMF_VARS.secboot.fd -%{_datadir}/%{name}/ovmf-ia32/Shell.efi -%{_datadir}/%{name}/ovmf-ia32/UefiShell.iso -%{_datadir}/%{name}/ovmf-ia32/DBXUpdate*.bin -%{_datadir}/qemu/firmware/30-edk2-ovmf-ia32-sb-enrolled.json -%{_datadir}/qemu/firmware/40-edk2-ovmf-ia32-sb.json -%{_datadir}/qemu/firmware/50-edk2-ovmf-ia32-nosb.json - -%files experimental -%common_files -%doc README.experimental -%dir %{_datadir}/%{name}/experimental -%{_datadir}/%{name}/experimental/*.fd -%{_datadir}/%{name}/experimental/*.raw -%{_datadir}/%{name}/experimental/*.qcow2 -%{_datadir}/%{name}/experimental/*.pcr - -%files ovmf-xen -%common_files -%dir %{_datadir}/%{name}/xen -%{_datadir}/%{name}/xen/*.fd -%endif - -%files arm -%common_files -%dir %{_datadir}/AAVMF/ -%{_datadir}/AAVMF/AAVMF32_CODE.fd -%dir %{_datadir}/%{name}/arm -%{_datadir}/%{name}/arm/QEMU_EFI-pflash.raw -%{_datadir}/%{name}/arm/QEMU_EFI.fd -%{_datadir}/%{name}/arm/QEMU_VARS.fd -%{_datadir}/%{name}/arm/vars-template-pflash.raw -%{_datadir}/qemu/firmware/50-edk2-arm-verbose.json - -%files riscv64 -%common_files -%{_datadir}/%{name}/riscv/*.fd -%{_datadir}/%{name}/riscv/*.qcow2 -%{_datadir}/qemu/firmware/50-edk2-riscv-qcow2.json - -%files ext4 -%common_files -%dir %{_datadir}/%{name}/drivers -%{_datadir}/%{name}/drivers/ext4*.efi - - -%files tools-python -%{_bindir}/build -%{_bindir}/BPDG -%{_bindir}/Ecc -%{_bindir}/GenDepex -%{_bindir}/GenFds -%{_bindir}/GenPatchPcdTable -%{_bindir}/PatchPcdValue -%{_bindir}/TargetTool -%{_bindir}/Trim -%{_bindir}/UPT -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/Python - -# endif fedora -%endif - - %changelog -%autochangelog +* Tue Apr 02 2024 Miroslav Rezanina - 20240214-1 +- Imported edk2-202402 from RHEL 9 +- Resolves: RHEL-30180 + diff --git a/make-tarball.sh b/make-tarball.sh deleted file mode 100755 index 7020310..0000000 --- a/make-tarball.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -# args -repo="${1%/}" -ref="${2-HEAD}" -ab="${3-12}" - -# check -if test ! -d "${repo}/.git"; then - echo "usage: $0 [ [ ] ]" - exit 1 -fi - -# get + print info -commit=$(cd $repo; git show --abbrev=$ab --pretty='format:%h' $ref | head -1) -date=$(cd $repo; git show --pretty='format:%cs' $ref | head -1 | tr -d '-') -echo "# $repo $ref -> commit $commit - date $date" - -# create tarball -name="${repo##*/}" -file="${name}-${commit}.tar.xz" -(cd $repo; git archive --format=tar --prefix=${name}-${commit}/ ${commit}) \ - | xz -9ev > "$file" -echo "# $file written" diff --git a/sources b/sources index a9d66fc..18fa3eb 100644 --- a/sources +++ b/sources @@ -1,5 +1,3 @@ -SHA512 (softfloat-20180726-gitb64af41.tar.xz) = f079debd1bfcc0fe64329a8947b0689ef49246793edcdd28a2879f6550c652b0cf0f53ac4f6f5ab61ac4f7933972e0019d0ab63eb9931b6884c2909f3a5ead30 -SHA512 (jansson-2.13.1.tar.bz2) = 057f0eda43e4162569888d739f4d78d1d02fce8359400d8f66fdc6e440b0405cb457e1126820dc8ce51e9c4a7f4b7effc640caf1d54307c78c0c47c3fc093011 -SHA512 (edk2-8736b8fdca85.tar.xz) = 217df116863f247b0316f8af643002abc0716a35c1b0260007127d443a7bd5dfced49c373c9ef483c3490f772d7f04f35817ce8a51592902e489e1ea9a005111 -SHA512 (edk2-platforms-10e2eb030de3.tar.xz) = 8b0c3ff4fbfc6ed7622e0f34e379da3251c8d67d821d5f1d0c27a1d8294da848193105f2f94b7636233f91cfc726fbd6fae875e06db2dfd986393deb2e084c7d -SHA512 (openssl-rhel-db0287935122edceb91dcda8dfb53b4090734e22.tar.xz) = a0f525832d385427b67a31b68b09dcd77d761ff19c9dc07c02278107995ea806370990796632038fe09192f9f661e67393f54567385e0fe96d382833c3abc453 +SHA512 (DBXUpdate-20230509.x64.bin) = 71fb6e8cd6918126b3acd78b95651913336df372e13fdfdfdd20d5d23f0e509050c6c88c8a2c43f8ac44f987df86bd45174bb3065d5a7a8c7e3b8772fd06d624 +SHA512 (edk2-edc6681206.tar.xz) = 6cb8812ae80702125f3b7ac3721eaed805eaa7997f486012fa4b83ac5b6a422ca31f8b34b7cc712750ab5d402d9d6e3f9d9aacf3dc9065833afc3fe555bb9021 +SHA512 (openssl-rhel-db0287935122edceb91dcda8dfb53b4090734e22.tar.xz) = 7958f06cd36b74215feec13a11c86026568f51650d598e048d94598cdc227ac7d2b97eceb1910f3c19e3525c3199b8b5a438b5098156871f9feb3550f677ca58