diff --git a/SOURCES/osuosl-enable-ppc64.patch b/SOURCES/osuosl-enable-ppc64.patch new file mode 100644 index 0000000..ea9344a --- /dev/null +++ b/SOURCES/osuosl-enable-ppc64.patch @@ -0,0 +1,11 @@ +diff -ur old/hw/ppc/spapr.c new/hw/ppc/spapr.c +--- old/hw/ppc/spapr.c 2025-04-17 22:54:19.662932754 +0000 ++++ new/hw/ppc/spapr.c 2025-04-18 03:45:15.811916763 +0000 +@@ -4840,7 +4840,6 @@ + { \ + MachineClass *mc = MACHINE_CLASS(oc); \ + MACHINE_VER_SYM(class_options, spapr, __VA_ARGS__)(mc); \ +- MACHINE_VER_DEPRECATION(__VA_ARGS__); \ + if (latest) { \ + spapr_machine_latest_class_options(mc); \ + } \ diff --git a/SPECS/qemu-kvm.spec b/SPECS/qemu-kvm.spec index b56792e..94b04ad 100644 --- a/SPECS/qemu-kvm.spec +++ b/SPECS/qemu-kvm.spec @@ -151,7 +151,7 @@ Obsoletes: %{name}-block-ssh <= %{epoch}:%{version} \ Summary: QEMU is a machine emulator and virtualizer Name: qemu-kvm Version: 9.1.0 -Release: 15%{?rcrel}%{?dist}%{?cc_suffix}.alma.1 +Release: 15%{?rcrel}%{?dist}%{?cc_suffix}.alma.2 # Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped # Epoch 15 used for RHEL 8 # Epoch 17 used for RHEL 9 (due to release versioning offset in RHEL 8.5) @@ -471,6 +471,7 @@ Patch148: kvm-iotests-Add-NBD-based-tests-for-inactive-nodes.patch # AlmaLinux Patch Patch149: 0001-Bring-back-missing-line-in-target-ppc-cpu-models.patch Patch150: 0001-usb-add-config-options-for-hub-and-hid-devices-for-p.patch +Patch151: osuosl-enable-ppc64.patch %if %{have_clang} BuildRequires: clang @@ -1294,7 +1295,11 @@ rm -rf %{buildroot}%{_datadir}/%{name}/efi*.rom # Provided by package ipxe rm -rf %{buildroot}%{_datadir}/%{name}/pxe*rom # Provided by package vgabios +%ifnarch %{power64} rm -rf %{buildroot}%{_datadir}/%{name}/vgabios*bin +%else +rm -rf %{buildroot}%{_datadir}/%{name}/vgabios-*.bin +%endif # Provided by package seabios rm -rf %{buildroot}%{_datadir}/%{name}/bios*.bin rm -rf %{buildroot}%{_datadir}/%{name}/sgabios.bin @@ -1466,6 +1471,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_sysconfdir}/security/limits.d/95-kvm-memlock.conf %endif +%ifarch %{power64} + %{_datadir}/%{name}/vgabios.bin +%endif + %files core %{_libexecdir}/qemu-kvm %{_datadir}/systemtap/tapset/qemu-kvm.stp @@ -1543,6 +1552,10 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Fri May 16 2025 Eduard Abdullin - 17:9.1.0-15.alma.2 +- Apply osuosl-enable-ppc64.patch +- Add vgabios.bin for ppc64le + * Thu Apr 10 2025 Eduard Abdullin - 17:9.1.0-15.alma.1 - Enable building for ppc64le - Don't remove slof.bin for ppc64le