From 2b2e6bc468f9bf7b30ae83c4645f79c65224f164 Mon Sep 17 00:00:00 2001 From: Vince Perri Date: Wed, 21 Jun 2023 20:30:08 +0000 Subject: [PATCH 1/2] edk2: Add nvram-template mapping to ovmf x64 config --- SPECS/edk2/60-edk2-ovmf-x64-amdsev.json | 4 ++++ SPECS/edk2/60-edk2-ovmf-x64-inteltdx.json | 4 ++++ SPECS/edk2/edk2.spec | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/SPECS/edk2/60-edk2-ovmf-x64-amdsev.json b/SPECS/edk2/60-edk2-ovmf-x64-amdsev.json index 9a561bc7eb2..08475a4ba0c 100644 --- a/SPECS/edk2/60-edk2-ovmf-x64-amdsev.json +++ b/SPECS/edk2/60-edk2-ovmf-x64-amdsev.json @@ -9,6 +9,10 @@ "executable": { "filename": "/usr/share/edk2/ovmf/OVMF.amdsev.fd", "format": "raw" + }, + "nvram-template": { + "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd", + "format": "raw" } }, "targets": [ diff --git a/SPECS/edk2/60-edk2-ovmf-x64-inteltdx.json b/SPECS/edk2/60-edk2-ovmf-x64-inteltdx.json index 44993ab1f3c..612cd8afa06 100644 --- a/SPECS/edk2/60-edk2-ovmf-x64-inteltdx.json +++ b/SPECS/edk2/60-edk2-ovmf-x64-inteltdx.json @@ -9,6 +9,10 @@ "executable": { "filename": "/usr/share/edk2/ovmf/OVMF.inteltdx.fd", "format": "raw" + }, + "nvram-template": { + "filename": "/usr/share/edk2/ovmf/OVMF_VARS.fd", + "format": "raw" } }, "targets": [ diff --git a/SPECS/edk2/edk2.spec b/SPECS/edk2/edk2.spec index d1d15ab6511..cfc88042781 100644 --- a/SPECS/edk2/edk2.spec +++ b/SPECS/edk2/edk2.spec @@ -45,7 +45,7 @@ ExclusiveArch: x86_64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 33%{?dist} +Release: 34%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT URL: http://www.tianocore.org @@ -685,6 +685,9 @@ done %changelog +* Wed Jun 21 2023 Vince Perri - 20230301gitf80f052277c8-34 +- Patch CVE-2023-0464 in bundled OpenSSL. + * Tue Jun 6 2023 Daniel McIlvaney - 20230301gitf80f052277c8-33 - Patch CVE-2023-0464 in bundled OpenSSL. From eea5a9b1ac1c47d4651dce94f4ef7137a57db679 Mon Sep 17 00:00:00 2001 From: Vince Perri Date: Thu, 22 Jun 2023 20:58:17 +0000 Subject: [PATCH 2/2] Fix edk2 changelog --- SPECS/edk2/edk2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/edk2/edk2.spec b/SPECS/edk2/edk2.spec index cfc88042781..1abecba80bc 100644 --- a/SPECS/edk2/edk2.spec +++ b/SPECS/edk2/edk2.spec @@ -686,7 +686,7 @@ done %changelog * Wed Jun 21 2023 Vince Perri - 20230301gitf80f052277c8-34 -- Patch CVE-2023-0464 in bundled OpenSSL. +- Add nvram-template mapping to ovmf x64 config. * Tue Jun 6 2023 Daniel McIlvaney - 20230301gitf80f052277c8-33 - Patch CVE-2023-0464 in bundled OpenSSL.