From 35f31ef3833d12605dbcea14cbfde5d69086c237 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 07 2021 18:30:18 +0000
Subject: import edk2-20210527gite1999b264f1f-7.el9


---

diff --git a/SPECS/edk2.spec b/SPECS/edk2.spec
index a9c0d90..6d12b38 100644
--- a/SPECS/edk2.spec
+++ b/SPECS/edk2.spec
@@ -24,7 +24,7 @@ ExclusiveArch: x86_64 aarch64
 
 Name:       edk2
 Version:    %{GITDATE}git%{GITCOMMIT}
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    UEFI firmware for 64-bit virtual machines
 License:    BSD-2-Clause-Patent and OpenSSL and MIT
 URL:        http://www.tianocore.org
@@ -269,7 +269,8 @@ fi
 CC_FLAGS="$CC_FLAGS --cmd-len=65536 -t %{TOOLCHAIN} -b DEBUG --hash"
 CC_FLAGS="$CC_FLAGS -D NETWORK_IP6_ENABLE"
 CC_FLAGS="$CC_FLAGS -D NETWORK_HTTP_BOOT_ENABLE -D NETWORK_TLS_ENABLE"
-CC_FLAGS="$CC_FLAGS -D TPM_ENABLE"
+CC_FLAGS="$CC_FLAGS -D TPM_ENABLE"  # x86
+CC_FLAGS="$CC_FLAGS -D TPM2_ENABLE" # arm
 
 OVMF_FLAGS="${CC_FLAGS}"
 OVMF_FLAGS="${OVMF_FLAGS} -D FD_SIZE_4MB"
@@ -563,6 +564,11 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$')
 
 
 %changelog
+* Mon Nov 01 2021 Miroslav Rezanina <mrezanin@redhat.com> - 20210527gite1999b264f1f-7
+- edk2-fix-tpm-build-options.patch [bz#2000396]
+- Resolves: bz#2000396
+  ([aarch64][RHEL9] The lack of TPMFinalLog in efi causes the tpm self-test in the guest to fail)
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20210527gite1999b264f1f-6
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688