diff --git a/.gitignore b/.gitignore index dbc0677..360472e 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /qemu-ovmf-secureboot-20200228-gitc3e16b3.tar.xz /openssl-rhel-bdd048e929dcfcf2f046d74e812e0e3d5fc58504.tar.xz /openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz +/openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz diff --git a/edk2.spec b/edk2.spec index b47966d..9390a17 100644 --- a/edk2.spec +++ b/edk2.spec @@ -24,7 +24,7 @@ ExclusiveArch: x86_64 aarch64 Name: edk2 Version: %{GITDATE}git%{GITCOMMIT} -Release: 2%{?dist} +Release: 3%{?dist} Summary: UEFI firmware for 64-bit virtual machines License: BSD-2-Clause-Patent and OpenSSL and MIT URL: http://www.tianocore.org @@ -35,7 +35,7 @@ URL: http://www.tianocore.org # | xz -9ev >/tmp/edk2-$COMMIT.tar.xz Source0:edk2-%{GITCOMMIT}.tar.xz Source1: ovmf-whitepaper-c770f8c.txt -Source2: openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz +Source2: openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz Source3: ovmf-vars-generator Source4: LICENSE.qosb Source5: RedHatSecureBootPkKek1.pem @@ -528,6 +528,14 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$') %changelog +* Mon Aug 01 2022 Miroslav Rezanina - 20220526git16779ede2d36-3 +- edk2-openssl-jump-to-8.7.0-branch-2022-07-22.patch [bz#2074843] +- edk2-ovmf-vars-generator-Use-max-cpu.patch [bz#2111567] +- Resolves: bz#2074843 + (edk2: sync openssl sources with rhel openssl rpm) +- Resolves: bz#2111567 + (EDK2 build stuck with qemu-kvm-7.0.0-8.el9 or newer) + * Fri Jun 24 2022 Miroslav Rezanina - 20220526git16779ede2d36-2 - edk2-OvmfPkg-Update-target-machines-config.patch [bz#2090752] - Resolves: bz#2090752 diff --git a/ovmf-vars-generator b/ovmf-vars-generator index 111e438..99bc4e5 100755 --- a/ovmf-vars-generator +++ b/ovmf-vars-generator @@ -46,6 +46,7 @@ def generate_qemu_cmd(args, readonly, *extra_args): args.qemu_binary, '-machine', machinetype, '-display', 'none', + '-cpu', 'max', '-no-user-config', '-nodefaults', '-m', '768', diff --git a/sources b/sources index 69a9a88..d174c8c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (edk2-16779ede2d36.tar.xz) = ab4fe5208506d93796db45cdcc63b95d99ebeb34e4783ede9b4bb411befe0dd09adf64b2cdf390180bc5c007ac5cde3b9692d4bf4c536261631ecccf0e2778c9 -SHA512 (openssl-rhel-a75722161d20fd632f8875585d3aa066ec5fea93.tar.xz) = eea5d4e6eeb3b915277d0b82d3d11c2cb5018ea68f4c37eaba838acfa059f6b4c8b5dfa3e1121862d5a73ebe125bd664627aebe70b8fc5706f3fcc653887f466 +SHA512 (openssl-rhel-740e53ace8f6771c205bf84780e26bcd7a3275df.tar.xz) = 189a9e336c396725ad6f75ced0af1ef76c408f79fd8de5a0784b47bbe3a695a2982a87208083c4a0f20b8ae32e11c8102f03479b39d16fe5b6774e7e6d20445d