From e51a8c697e19bd775ebe03684c170c8d398a62ca Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 2 Dec 2020 15:15:31 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/edk2.git#ce201154d66a9c56841767843d3f35ef7db058ec --- edk2.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/edk2.spec b/edk2.spec index 8573d6b..e0cbf69 100644 --- a/edk2.spec +++ b/edk2.spec @@ -46,7 +46,7 @@ Name: edk2 # to use YYYMMDD to avoid needing to bump package epoch # due to previous 'git' Version: Version: %{edk2_stable_date}01stable -Release: 1%{dist} +Release: 2%{dist} Summary: EFI Development Kit II License: BSD-2-Clause-Patent @@ -121,6 +121,7 @@ BuildRequires: qemu-img BuildRequires: genisoimage BuildRequires: bc BuildRequires: sed +BuildRequires: perl # These are for QOSB BuildRequires: python3-requests @@ -239,6 +240,7 @@ rm -rf ShellBinPkg cp -a -- %{SOURCE2} . # extract openssl into place tar -xf %{SOURCE1} --strip-components=1 --directory CryptoPkg/Library/OpensslLib/openssl +(cd CryptoPkg/Library/OpensslLib && perl process_files.pl) # extract softfloat into place tar -xf %{SOURCE4} --strip-components=1 --directory ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3/ @@ -593,6 +595,9 @@ install qemu-ovmf-secureboot-%{qosb_version}/ovmf-vars-generator %{buildroot}%{_ %changelog +* 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