rpms/edk2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix qemu packaging conditionals for ELN builds

Browse Source 
In ELN builds %{rhel} is defined and %{fedora} is unset

This causes EDK to assume the RHEL qemu-kvm packaging scheme.

This is invalid for ELN, however, because it still follows the
Fedora packaging scheme for QEMU.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2021-09-01 18:40:04 +01:00
parent d18839888a
commit b20b83c1a2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
edk2.spec
View File

@ -18,10 +18,15 @@ ExclusiveArch: x86_64 aarch64
%define qosb_testing 1 %define qosb_testing 1
%endif %endif
%if %{defined rhel} %if %{defined fedora} || %{defined eln}
%define qemu_package qemu-system-x86-core
%define qemu_binary /usr/bin/qemu-system-x86_64
%else
%define qemu_package qemu-kvm-core >= 2.12.0-89 %define qemu_package qemu-kvm-core >= 2.12.0-89
%define qemu_binary /usr/libexec/qemu-kvm %define qemu_binary /usr/libexec/qemu-kvm
%endif
%if %{defined rhel}
%define build_ovmf 0 %define build_ovmf 0
%define build_aarch64 0 %define build_aarch64 0
%ifarch x86_64 %ifarch x86_64
@ -31,8 +36,6 @@ ExclusiveArch: x86_64 aarch64
%define build_aarch64 1 %define build_aarch64 1
%endif %endif
%else %else
%define qemu_package qemu-system-x86-core
%define qemu_binary /usr/bin/qemu-system-x86_64
%define build_ovmf 1 %define build_ovmf 1
%define build_aarch64 1 %define build_aarch64 1
%endif %endif
@ -44,7 +47,7 @@ ExclusiveArch: x86_64 aarch64
Name: edk2 Name: edk2
Version: %{GITDATE}git%{GITCOMMIT} Version: %{GITDATE}git%{GITCOMMIT}
Release: 2%{?dist} Release: 3%{?dist}
Summary: UEFI firmware for 64-bit virtual machines Summary: UEFI firmware for 64-bit virtual machines
License: BSD-2-Clause-Patent and OpenSSL and MIT License: BSD-2-Clause-Patent and OpenSSL and MIT
URL: http://www.tianocore.org URL: http://www.tianocore.org
@ -740,6 +743,9 @@ KERNEL_IMG=$(rpm -q -l $KERNEL_PKG | egrep '^/lib/modules/[^/]+/vmlinuz$')
%changelog %changelog
* Wed Sep 1 2021 Daniel P. Berrangé <berrange@redhat.com> - 20210527gite1999b264f1f-3
- Fix qemu packaging conditionals for ELN builds
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210527gite1999b264f1f-2 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210527gite1999b264f1f-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild