From d8f104def4475be8a4fcbdceea9d93ee71107b42 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 19 May 2025 21:03:41 +0200 Subject: [PATCH] - starting with QEMU 10.0.0, 64-bit guests are no longer supported on 32-bit hosts --- qemu.spec | 110 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 81 insertions(+), 29 deletions(-) diff --git a/qemu.spec b/qemu.spec index 2af9a47..de3df42 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1200,6 +1200,28 @@ done # cleanup Sphinx files %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/{.buildinfo,objects.inv} +# remove files that belong to 64-bit guest packages which are not available +# on 32-bit builds since QEMU 10.0.0, keep file per line for readability +%{__rm} \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-aarch64-code.fd \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-loongarch64-code.fd \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-loongarch64-vars.fd \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-riscv-code.fd \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-riscv-vars.fd \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-x86_64-code.fd \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/edk2-x86_64-secure-code.fd \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/firmware/50-edk2-x86_64-secure.json \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/firmware/60-edk2-aarch64.json \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/firmware/60-edk2-loongarch64.json \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/firmware/60-edk2-riscv64.json \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/firmware/60-edk2-x86_64.json \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/hppa-firmware.img \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/hppa-firmware64.img \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/openbios-sparc64 \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/opensbi-riscv64-generic-fw_dynamic.bin \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/palcode-clipper \ + $RPM_BUILD_ROOT%{_datadir}/%{name}/s390-ccw.img + %clean rm -rf $RPM_BUILD_ROOT @@ -1334,90 +1356,98 @@ fi %files user %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/qemu-aarch64 -%attr(755,root,root) %{_bindir}/qemu-aarch64_be -%attr(755,root,root) %{_bindir}/qemu-alpha %attr(755,root,root) %{_bindir}/qemu-arm %attr(755,root,root) %{_bindir}/qemu-armeb %attr(755,root,root) %{_bindir}/qemu-hexagon -%attr(755,root,root) %{_bindir}/qemu-hppa %attr(755,root,root) %{_bindir}/qemu-i386 %attr(755,root,root) %{_bindir}/qemu-io -%attr(755,root,root) %{_bindir}/qemu-loongarch64 %attr(755,root,root) %{_bindir}/qemu-m68k %attr(755,root,root) %{_bindir}/qemu-microblaze %attr(755,root,root) %{_bindir}/qemu-microblazeel %attr(755,root,root) %{_bindir}/qemu-mips %attr(755,root,root) %{_bindir}/qemu-mipsel +%attr(755,root,root) %{_bindir}/qemu-or1k +%attr(755,root,root) %{_bindir}/qemu-ppc +%attr(755,root,root) %{_bindir}/qemu-riscv32 +%attr(755,root,root) %{_bindir}/qemu-sh4 +%attr(755,root,root) %{_bindir}/qemu-sh4eb +%attr(755,root,root) %{_bindir}/qemu-sparc +%attr(755,root,root) %{_bindir}/qemu-xtensa +%attr(755,root,root) %{_bindir}/qemu-xtensaeb +%ifarch %{x8664} +%attr(755,root,root) %{_bindir}/qemu-aarch64 +%attr(755,root,root) %{_bindir}/qemu-aarch64_be +%attr(755,root,root) %{_bindir}/qemu-alpha +%attr(755,root,root) %{_bindir}/qemu-hppa +%attr(755,root,root) %{_bindir}/qemu-loongarch64 %attr(755,root,root) %{_bindir}/qemu-mips64 %attr(755,root,root) %{_bindir}/qemu-mips64el %attr(755,root,root) %{_bindir}/qemu-mipsn32 %attr(755,root,root) %{_bindir}/qemu-mipsn32el -%attr(755,root,root) %{_bindir}/qemu-or1k -%attr(755,root,root) %{_bindir}/qemu-ppc %attr(755,root,root) %{_bindir}/qemu-ppc64 %attr(755,root,root) %{_bindir}/qemu-ppc64le -%attr(755,root,root) %{_bindir}/qemu-riscv32 %attr(755,root,root) %{_bindir}/qemu-riscv64 %attr(755,root,root) %{_bindir}/qemu-s390x -%attr(755,root,root) %{_bindir}/qemu-sh4 -%attr(755,root,root) %{_bindir}/qemu-sh4eb -%attr(755,root,root) %{_bindir}/qemu-sparc %attr(755,root,root) %{_bindir}/qemu-sparc32plus %attr(755,root,root) %{_bindir}/qemu-sparc64 %attr(755,root,root) %{_bindir}/qemu-x86_64 -%attr(755,root,root) %{_bindir}/qemu-xtensa -%attr(755,root,root) %{_bindir}/qemu-xtensaeb +%endif %if %{with user_static} %files user-static %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/qemu-aarch64-static -%attr(755,root,root) %{_bindir}/qemu-aarch64_be-static -%attr(755,root,root) %{_bindir}/qemu-alpha-static %attr(755,root,root) %{_bindir}/qemu-arm-static %attr(755,root,root) %{_bindir}/qemu-armeb-static %attr(755,root,root) %{_bindir}/qemu-hexagon-static -%attr(755,root,root) %{_bindir}/qemu-hppa-static %attr(755,root,root) %{_bindir}/qemu-i386-static -%attr(755,root,root) %{_bindir}/qemu-loongarch64-static %attr(755,root,root) %{_bindir}/qemu-m68k-static %attr(755,root,root) %{_bindir}/qemu-microblaze-static %attr(755,root,root) %{_bindir}/qemu-microblazeel-static %attr(755,root,root) %{_bindir}/qemu-mips-static +%attr(755,root,root) %{_bindir}/qemu-mipsel-static +%attr(755,root,root) %{_bindir}/qemu-or1k-static +%attr(755,root,root) %{_bindir}/qemu-ppc-static +%attr(755,root,root) %{_bindir}/qemu-riscv32-static +%attr(755,root,root) %{_bindir}/qemu-sh4-static +%attr(755,root,root) %{_bindir}/qemu-sh4eb-static +%attr(755,root,root) %{_bindir}/qemu-sparc-static +%attr(755,root,root) %{_bindir}/qemu-xtensa-static +%attr(755,root,root) %{_bindir}/qemu-xtensaeb-static +%ifarch %{x8664} +%attr(755,root,root) %{_bindir}/qemu-aarch64-static +%attr(755,root,root) %{_bindir}/qemu-aarch64_be-static +%attr(755,root,root) %{_bindir}/qemu-alpha-static +%attr(755,root,root) %{_bindir}/qemu-hppa-static +%attr(755,root,root) %{_bindir}/qemu-loongarch64-static %attr(755,root,root) %{_bindir}/qemu-mips64-static %attr(755,root,root) %{_bindir}/qemu-mips64el-static -%attr(755,root,root) %{_bindir}/qemu-mipsel-static %attr(755,root,root) %{_bindir}/qemu-mipsn32-static %attr(755,root,root) %{_bindir}/qemu-mipsn32el-static -%attr(755,root,root) %{_bindir}/qemu-or1k-static -%attr(755,root,root) %{_bindir}/qemu-ppc-static %attr(755,root,root) %{_bindir}/qemu-ppc64-static %attr(755,root,root) %{_bindir}/qemu-ppc64le-static -%attr(755,root,root) %{_bindir}/qemu-riscv32-static %attr(755,root,root) %{_bindir}/qemu-riscv64-static %attr(755,root,root) %{_bindir}/qemu-s390x-static -%attr(755,root,root) %{_bindir}/qemu-sh4-static -%attr(755,root,root) %{_bindir}/qemu-sh4eb-static -%attr(755,root,root) %{_bindir}/qemu-sparc-static %attr(755,root,root) %{_bindir}/qemu-sparc32plus-static %attr(755,root,root) %{_bindir}/qemu-sparc64-static %attr(755,root,root) %{_bindir}/qemu-x86_64-static -%attr(755,root,root) %{_bindir}/qemu-xtensa-static -%attr(755,root,root) %{_bindir}/qemu-xtensaeb-static +%endif %{?with_systemtap:%attr(755,root,root) %{_bindir}/qemu-trace-stap-static} %endif +%ifarch %{x8664} %files system-aarch64 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-aarch64 %{_datadir}/%{name}/edk2-aarch64-code.fd %{_datadir}/%{name}/firmware/60-edk2-aarch64.json +%endif +%ifarch %{x8664} %files system-alpha %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-alpha %{_datadir}/%{name}/palcode-clipper +%endif %files system-arm %defattr(644,root,root,755) @@ -1432,31 +1462,37 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-avr +%ifarch %{x8664} %files system-hppa %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-hppa %{_datadir}/%{name}/hppa-firmware.img %{_datadir}/%{name}/hppa-firmware64.img +%endif %files system-m68k %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-m68k +%ifarch %{x8664} %files system-microblaze %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-microblaze %attr(755,root,root) %{_bindir}/qemu-system-microblazeel +%endif %files system-mips %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/qemu-system-loongarch64 %attr(755,root,root) %{_bindir}/qemu-system-mips %attr(755,root,root) %{_bindir}/qemu-system-mipsel +%ifarch %{x8664} +%attr(755,root,root) %{_bindir}/qemu-system-loongarch64 %attr(755,root,root) %{_bindir}/qemu-system-mips64 %attr(755,root,root) %{_bindir}/qemu-system-mips64el %{_datadir}/%{name}/edk2-loongarch64-code.fd %{_datadir}/%{name}/edk2-loongarch64-vars.fd %{_datadir}/%{name}/firmware/60-edk2-loongarch64.json +%endif %files system-or1k %defattr(644,root,root,755) @@ -1465,7 +1501,9 @@ fi %files system-ppc %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-ppc +%ifarch %{x8664} %attr(755,root,root) %{_bindir}/qemu-system-ppc64 +%endif %{_datadir}/%{name}/bamboo.dtb %{_datadir}/%{name}/canyonlands.dtb %{_datadir}/%{name}/openbios-ppc @@ -1485,6 +1523,7 @@ fi %attr(755,root,root) %{_bindir}/qemu-system-riscv32 %{_datadir}/%{name}/opensbi-riscv32-generic-fw_dynamic.bin +%ifarch %{x8664} %files system-riscv64 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-riscv64 @@ -1492,15 +1531,18 @@ fi %{_datadir}/%{name}/edk2-riscv-code.fd %{_datadir}/%{name}/edk2-riscv-vars.fd %{_datadir}/%{name}/firmware/60-edk2-riscv64.json +%endif %files system-rx %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-rx +%ifarch %{x8664} %files system-s390x %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-s390x %{_datadir}/%{name}/s390-ccw.img +%endif %files system-sh4 %defattr(644,root,root,755) @@ -1510,11 +1552,15 @@ fi %files system-sparc %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-sparc +%ifarch %{x8664} %attr(755,root,root) %{_bindir}/qemu-system-sparc64 +%endif %{_datadir}/%{name}/QEMU,cgthree.bin %{_datadir}/%{name}/QEMU,tcx.bin %{_datadir}/%{name}/openbios-sparc32 +%ifarch %{x8664} %{_datadir}/%{name}/openbios-sparc64 +%endif %files system-tricore %defattr(644,root,root,755) @@ -1523,7 +1569,9 @@ fi %files system-x86 %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/qemu-system-i386 +%ifarch %{x8664} %attr(755,root,root) %{_bindir}/qemu-system-x86_64 +%endif %ifarch %{ix86} %{x8664} x32 %config(noreplace) %verify(not md5 mtime size) /etc/modules-load.d/kvm.conf /lib/udev/rules.d/80-kvm.rules @@ -1534,8 +1582,10 @@ fi %{_datadir}/%{name}/edk2-i386-code.fd %{_datadir}/%{name}/edk2-i386-secure-code.fd %{_datadir}/%{name}/edk2-i386-vars.fd +%ifarch %{x8664} %{_datadir}/%{name}/edk2-x86_64-code.fd %{_datadir}/%{name}/edk2-x86_64-secure-code.fd +%endif %{_datadir}/%{name}/efi-e1000e.rom %{_datadir}/%{name}/efi-e1000.rom %{_datadir}/%{name}/efi-eepro100.rom @@ -1567,9 +1617,11 @@ fi %{_datadir}/%{name}/vgabios-virtio.bin %{_datadir}/%{name}/vgabios-vmware.bin %{_datadir}/%{name}/firmware/50-edk2-i386-secure.json -%{_datadir}/%{name}/firmware/50-edk2-x86_64-secure.json %{_datadir}/%{name}/firmware/60-edk2-i386.json +%ifarch %{x8664} +%{_datadir}/%{name}/firmware/50-edk2-x86_64-secure.json %{_datadir}/%{name}/firmware/60-edk2-x86_64.json +%endif %files system-xtensa %defattr(644,root,root,755) -- 2.49.0