From 06d527f3f0a157b885db4d650b95649f90212f35 Mon Sep 17 00:00:00 2001 From: Miroslav Rezanina Date: Mon, 22 May 2023 03:52:54 -0400 Subject: [PATCH] * Mon May 22 2023 Miroslav Rezanina - 20230301gitf80f052277c8-5 - edk2-dbx-update-2023-05-09-black-lotus-edition.patch [RHEL-470] - edk2-json-descriptors-explicitly-set-mode-split.patch [RHEL-469] - Resolves: RHEL-470 (edk2: update variable store with latest dbx updates (may 9, black lotus edition)) - Resolves: RHEL-469 (explicitly set mode = split in firmware json description files) --- .gitignore | 1 + 30-edk2-ovmf-x64-sb-enrolled.json | 1 + 40-edk2-ovmf-x64-sb.json | 1 + 50-edk2-aarch64-qcow2.json | 1 + 50-edk2-ovmf-x64-nosb.json | 1 + 51-edk2-aarch64-raw.json | 1 + 52-edk2-aarch64-verbose-qcow2.json | 1 + 53-edk2-aarch64-verbose-raw.json | 1 + edk2.spec | 12 ++++++++++-- sources | 2 +- 10 files changed, 19 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ab68227..a6ab119 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz /openssl-rhel-d00c3c5b8a9d6d3ea3dabfcafdf36afd61ba8bcc.tar.xz /DBXUpdate-20230314.x64.bin +/DBXUpdate-20230509.x64.bin diff --git a/30-edk2-ovmf-x64-sb-enrolled.json b/30-edk2-ovmf-x64-sb-enrolled.json index 3fbb0d7..d77ed08 100644 --- a/30-edk2-ovmf-x64-sb-enrolled.json +++ b/30-edk2-ovmf-x64-sb-enrolled.json @@ -5,6 +5,7 @@ ], "mapping": { "device": "flash", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd", "format": "raw" diff --git a/40-edk2-ovmf-x64-sb.json b/40-edk2-ovmf-x64-sb.json index ca67350..02a7622 100644 --- a/40-edk2-ovmf-x64-sb.json +++ b/40-edk2-ovmf-x64-sb.json @@ -5,6 +5,7 @@ ], "mapping": { "device": "flash", + "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 ec0f00f..937d295 100644 --- a/50-edk2-aarch64-qcow2.json +++ b/50-edk2-aarch64-qcow2.json @@ -5,6 +5,7 @@ ], "mapping": { "device": "flash", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.qcow2", "format": "qcow2" diff --git a/50-edk2-ovmf-x64-nosb.json b/50-edk2-ovmf-x64-nosb.json index 1685da9..c660e0c 100644 --- a/50-edk2-ovmf-x64-nosb.json +++ b/50-edk2-ovmf-x64-nosb.json @@ -5,6 +5,7 @@ ], "mapping": { "device": "flash", + "mode": "split", "executable": { "filename": "/usr/share/edk2/ovmf/OVMF_CODE.fd", "format": "raw" diff --git a/51-edk2-aarch64-raw.json b/51-edk2-aarch64-raw.json index c5a73cb..506bbe6 100644 --- a/51-edk2-aarch64-raw.json +++ b/51-edk2-aarch64-raw.json @@ -5,6 +5,7 @@ ], "mapping": { "device": "flash", + "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 203be4b..976f2a6 100644 --- a/52-edk2-aarch64-verbose-qcow2.json +++ b/52-edk2-aarch64-verbose-qcow2.json @@ -5,6 +5,7 @@ ], "mapping": { "device": "flash", + "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 ceec878..fa0ed91 100644 --- a/53-edk2-aarch64-verbose-raw.json +++ b/53-edk2-aarch64-verbose-raw.json @@ -5,6 +5,7 @@ ], "mapping": { "device": "flash", + "mode": "split", "executable": { "filename": "/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw", "format": "raw" diff --git a/edk2.spec b/edk2.spec index 3d9f5f8..0f947f4 100644 --- a/edk2.spec +++ b/edk2.spec @@ -5,7 +5,7 @@ ExclusiveArch: x86_64 aarch64 %define TOOLCHAIN GCC5 %define OPENSSL_VER 1.1.1k -%define DBXDATE 20230314 +%define DBXDATE 20230509 %define build_ovmf 0 %define build_aarch64 0 @@ -18,7 +18,7 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 4%{?dist} +Release: 5%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT URL: http://www.tianocore.org @@ -399,6 +399,14 @@ install -m 0644 \ %changelog +* Mon May 22 2023 Miroslav Rezanina - 20230301gitf80f052277c8-5 +- edk2-dbx-update-2023-05-09-black-lotus-edition.patch [RHEL-470] +- edk2-json-descriptors-explicitly-set-mode-split.patch [RHEL-469] +- Resolves: RHEL-470 + (edk2: update variable store with latest dbx updates (may 9, black lotus edition)) +- Resolves: RHEL-469 + (explicitly set mode = split in firmware json description files) + * Tue May 16 2023 Miroslav Rezanina - 20230301gitf80f052277c8-4 - edk2-OvmfPkg-Clarify-invariants-for-NestedInterruptTplLib.patch [bz#2189136] - edk2-OvmfPkg-Relax-assertion-that-interrupts-do-not-occur.patch [bz#2189136] diff --git a/sources b/sources index cf25eb2..e44a039 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (edk2-f80f052277c8.tar.xz) = af802257f010b63d973dc909b57ee845b7734e8d494b081050ba1f197349663b081e1f2edc5244726e2479ff6d16d79d0a6fceb00f4840b59982f10b79facf66 SHA512 (openssl-rhel-d00c3c5b8a9d6d3ea3dabfcafdf36afd61ba8bcc.tar.xz) = 6842e767f767fe79edcb9ba8e32ce2956e8b56f0b265f79a5b4dbd4bba51b63d9733841badee7f2ffdcca803baf82b3e9e132fd465c22027539dcfd02608e99a -SHA512 (DBXUpdate-20230314.x64.bin) = 55eefa89f84f1d03996cc74e626fd1dc8c0ff3a94ad64c13bdeafdad071150bb7b4dbb46259e0c0412965a474f0c86c0634af71c18503e32c6fbdae35cd6cd06 +SHA512 (DBXUpdate-20230509.x64.bin) = 71fb6e8cd6918126b3acd78b95651913336df372e13fdfdfdd20d5d23f0e509050c6c88c8a2c43f8ac44f987df86bd45174bb3065d5a7a8c7e3b8772fd06d624