The package rpms/edk2.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/edk2.git/commit/?id=01cb3b8d22e22....
Change:
+ExclusiveArch: x86_64 %{arm} aarch64
Thanks.
Full change:
============
commit 01cb3b8d22e22f3028d1fca559e4e70bd399b822
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Thu Apr 7 07:42:24 2022 +0200
iasl is gone on i686, so stop building there
diff --git a/edk2.spec b/edk2.spec
index b8a3e3f..b8a42af 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -7,7 +7,7 @@
# in theory should build everywhere without much trouble, but
# in practice the edk2 build system barfs on archs it doesn't know
# (such as ppc), so lets limit things to the known-good ones.
-ExclusiveArch: %{ix86} x86_64 %{arm} aarch64
+ExclusiveArch: x86_64 %{arm} aarch64
%else
ExclusiveArch: x86_64 aarch64
%endif
@@ -768,6 +768,7 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep
'^/lib/modules/[^/]+/vmlinuz$')
%changelog
* Thu Apr 07 2022 Gerd Hoffmann <kraxel(a)redhat.com> - 20220221gitb24306f15daa-3
- Fix TPM build options.
+- Stop builds on i686 (iasl missing).
- Resolves rhbz#2072827
* Wed Mar 23 2022 Gerd Hoffmann <kraxel(a)redhat.com> - 20220221gitb24306f15daa-1
commit 8d8a395ac1216983fb1a09b5ec482e560b2352a8
Author: Gerd Hoffmann <kraxel(a)redhat.com>
Date: Thu Apr 7 07:28:55 2022 +0200
Fix TPM build options
diff --git a/edk2.spec b/edk2.spec
index 794e21d..b8a3e3f 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -52,7 +52,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
@@ -304,7 +304,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 TPM2_ENABLE"
+CC_FLAGS="$CC_FLAGS -D TPM1_ENABLE"
OVMF_FLAGS="${CC_FLAGS}"
%if %{defined rhel}
@@ -765,6 +766,10 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep
'^/lib/modules/[^/]+/vmlinuz$')
%changelog
+* Thu Apr 07 2022 Gerd Hoffmann <kraxel(a)redhat.com> - 20220221gitb24306f15daa-3
+- Fix TPM build options.
+- Resolves rhbz#2072827
+
* Wed Mar 23 2022 Gerd Hoffmann <kraxel(a)redhat.com> - 20220221gitb24306f15daa-1
- Update to edk2-stable202202
commit 6e680c0edff2730204496a192c4ae2609f85c723
Author: Thierry Vignaud <thierry.vignaud(a)gmail.com>
Date: Wed Mar 2 10:45:59 2022 +0100
Make "%define build_ovmf 0" works on Fedora when testing
diff --git a/edk2.spec b/edk2.spec
index bed94e7..794e21d 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -412,6 +412,7 @@ build ${CC_FLAGS} -a AARCH64 \
%if %{defined fedora}
+%if %{build_ovmf}
# build microvm
build ${OVMF_FLAGS} -a X64 -p OvmfPkg/Microvm/MicrovmX64.dsc
@@ -432,7 +433,8 @@ build_iso Build/OvmfIa32/DEBUG_%{TOOLCHAIN}/IA32
mv Build/OvmfIa32/DEBUG_%{TOOLCHAIN}/IA32/UefiShell.iso ovmf-ia32
cp -a Build/OvmfIa32/DEBUG_%{TOOLCHAIN}/IA32/Shell.efi ovmf-ia32
cp -a Build/OvmfIa32/DEBUG_%{TOOLCHAIN}/IA32/EnrollDefaultKeys.efi ovmf-ia32
-
+# endif build_ovmf
+%endif
# build ARMv7 firmware
mkdir -p arm
@@ -555,6 +557,7 @@ install -m 0644 edk2-aarch64-verbose.json \
%if %{defined fedora}
+%if %{build_ovmf}
# install microvm
install -m 0644 Build/MicrovmX64/DEBUG_%{TOOLCHAIN}/FV/MICROVM.fd \
%{buildroot}%{_datadir}/%{name}/ovmf/MICROVM.fd
@@ -572,7 +575,8 @@ cp -a ovmf-ia32 %{buildroot}%{_datadir}/%{name}
for f in %{_sourcedir}/*edk2-ovmf-ia32*.json; do
install -pm 644 $f %{buildroot}/%{_datadir}/qemu/firmware
done
-
+# endif build_ovmf
+%endif
# install arm32
cp -a arm %{buildroot}%{_datadir}/%{name}
@@ -708,6 +712,7 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep
'^/lib/modules/[^/]+/vmlinuz$')
%if %{defined fedora}
+%if %{build_ovmf}
%files ovmf-ia32
%common_files
%dir %{_datadir}/%{name}/ovmf-ia32
@@ -722,7 +727,7 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep
'^/lib/modules/[^/]+/vmlinuz$')
%{_datadir}/qemu/firmware/40-edk2-ovmf-ia32-sb-enrolled.json
%{_datadir}/qemu/firmware/50-edk2-ovmf-ia32-sb.json
%{_datadir}/qemu/firmware/60-edk2-ovmf-ia32.json
-
+%endif
%files arm
%common_files
commit 4f0dc9a19dee3b8dcfbc716985b4603dee2dfa2d
Author: Thierry Vignaud <tvignaud(a)redhat.com>
Date: Wed Mar 2 10:58:37 2022 +0100
Fix installing AAVMF32 if aarch64 is disabled (v2)
diff --git a/edk2.spec b/edk2.spec
index 6952d22..bed94e7 100644
--- a/edk2.spec
+++ b/edk2.spec
@@ -508,10 +508,9 @@ install -m 0644 edk2-ovmf-cc.json \
# endif build_ovmf
%endif
+mkdir -p %{buildroot}%{_datadir}/AAVMF
%if %{build_aarch64}
-mkdir -p \
- %{buildroot}%{_datadir}/AAVMF \
- %{buildroot}%{_datadir}/%{name}/aarch64
+mkdir -p %{buildroot}%{_datadir}/%{name}/aarch64
# Pad and install the verbose binary.
cat Build/ArmVirtQemu-AARCH64/DEBUG_%{TOOLCHAIN}/FV/QEMU_EFI.verbose.fd \