Fedora now advertises supported firmwares via descriptor files. Since the upstream spec file assumes recent Fedora, remove the build-time list of firmwares, which can produce a warning after commit 75597f022a. Signed-off-by: Jim Fehlig <jfehlig@suse.com> --- libvirt.spec.in | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2374668722..a6219da604 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1131,34 +1131,6 @@ exit 1 %define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux" -%if 0%{?fedora} - # Nightly edk2.git-ovmf-x64 - LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd" - # Nightly edk2.git-ovmf-ia32 - LOADERS="$LOADERS:/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd" - # Nightly edk2.git-aarch64 - LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw" - # Nightly edk2.git-arm - LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw" - - # Fedora edk2-ovmf, x86_64 - LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd" - # Fedora edk2-ovmf, x86_64, with Secure Boot - LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd:/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd" - # Fedora edk2-ovmf-ia32 - LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" - # Fedora edk2-ovmf-ia32, with Secure Boot. (NB: Unlike x86_64, for - # 'ia32', there is no secboot-variant "VARS" file (NVRAM template). - # So the NVRAM template for 'ovmf-ia32/OVMF_CODE.secboot.fd' is the - # same as the one for the non-secboot variant.) - LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.secboot.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd" - # Fedora edk2-aarch64 - LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw" - # Fedora edk2-arm - LOADERS="$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw" - %define arg_loader_nvram --with-loader-nvram="$LOADERS" -%endif - # place macros above and build commands below this comment export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec) @@ -1231,7 +1203,6 @@ cd %{_vpath_builddir} --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-tls-priority=%{tls_priority} \ - %{?arg_loader_nvram} \ %{?enable_werror} \ --enable-expensive-tests \ --with-init-script=systemd \ -- 2.23.0