From fada5c0d56c89b90696367a621e2aac5e715b8ba Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 8 Dec 2022 19:15:42 +0300 Subject: [PATCH] Fix issue with arm, ppc, s390 --- SPECS/qemu.spec | 61 ++++++++++++++++++------------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/SPECS/qemu.spec b/SPECS/qemu.spec index 9c651da..0f60f89 100644 --- a/SPECS/qemu.spec +++ b/SPECS/qemu.spec @@ -195,6 +195,7 @@ %endif %define requires_block_ssh Requires: %{name}-block-ssh = %{evr} %define requires_audio_alsa Requires: %{name}-audio-alsa = %{evr} +%define requires_audio_dbus Requires: %{name}-audio-dbus = %{evr} %define requires_audio_oss Requires: %{name}-audio-oss = %{evr} %define requires_audio_pa Requires: %{name}-audio-pa = %{evr} %define requires_audio_sdl Requires: %{name}-audio-sdl = %{evr} @@ -202,6 +203,7 @@ %define requires_device_usb_host Requires: %{name}-device-usb-host = %{evr} %define requires_device_usb_redirect Requires: %{name}-device-usb-redirect = %{evr} %define requires_ui_curses Requires: %{name}-ui-curses = %{evr} +%define requires_ui_dbus Requires: %{name}-ui-dbus = %{evr} %define requires_ui_gtk Requires: %{name}-ui-gtk = %{evr} %define requires_ui_sdl Requires: %{name}-ui-sdl = %{evr} %define requires_ui_egl_headless Requires: %{name}-ui-egl-headless = %{evr} @@ -256,6 +258,7 @@ %{requires_block_rbd} \ %{requires_block_ssh} \ %{requires_audio_alsa} \ +%{requires_audio_dbus} \ %{requires_audio_oss} \ %{requires_audio_pa} \ %{requires_audio_sdl} \ @@ -308,7 +311,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 7.0.0 Release: %{baserelease}%{?rcrel}%{?dist} -Epoch: 15 +Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -326,25 +329,6 @@ Source31: kvm-x86.conf Source36: README.tests Patch0001: 0001-sgx-stub-fix.patch -Patch0004: 0004-Initial-redhat-build.patch -Patch0005: 0005-Enable-disable-devices-for-RHEL.patch -Patch0006: 0006-Machine-type-related-general-changes.patch -Patch0007: 0007-Add-aarch64-machine-types.patch -Patch0008: 0008-Add-ppc64-machine-types.patch -Patch0009: 0009-Add-s390x-machine-types.patch -Patch0010: 0010-Add-x86_64-machine-types.patch -Patch0011: 0011-Enable-make-check.patch -Patch0012: 0012-vfio-cap-number-of-devices-that-can-be-assigned.patch -Patch0013: 0013-Add-support-statement-to-help-output.patch -Patch0014: 0014-globally-limit-the-maximum-number-of-CPUs.patch -Patch0015: 0015-Use-qemu-kvm-in-documentation-instead-of-qemu-system.patch -Patch0016: 0016-virtio-scsi-Reject-scsi-cd-if-data-plane-enabled-RHE.patch -Patch0017: 0017-BZ1653590-Require-at-least-64kiB-pages-for-downstrea.patch -Patch0018: 0018-qcow2-Deprecation-warning-when-opening-v2-images-rw.patch -Patch0019: 0019-WRB-Introduce-RHEL-9.0.0-hw-compat-structure.patch -Patch0020: 0020-redhat-Update-s390x-machine-type-compatibility-for-r.patch -Patch0021: 0021-pc-Move-s3-s4-suspend-disabling-to-compat.patch - BuildRequires: meson >= %{meson_version} BuildRequires: zlib-devel @@ -701,6 +685,12 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} %description audio-alsa This package provides the additional ALSA audio driver for QEMU. +%package audio-dbus +Summary: QEMU D-Bus audio driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description audio-dbus +This package provides the additional D-Bus audio driver for QEMU. + %package audio-oss Summary: QEMU OSS audio driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} @@ -719,18 +709,6 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} %description audio-sdl This package provides the additional SDL audio driver for QEMU. -%package audio-dbus -Summary: QEMU DBUS audio driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -%description audio-dbus -This package provides the additional DBUS audio driver for QEMU. - -%package audio-ui -Summary: QEMU UI audio driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -%description audio-ui -This package provides the additional UI audio driver for QEMU. - %if %{have_jack} %package audio-jack Summary: QEMU Jack audio driver @@ -746,6 +724,12 @@ Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} %description ui-curses This package provides the additional curses UI for QEMU. +%package ui-dbus +Summary: QEMU D-Bus UI driver +Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +%description ui-dbus +This package provides the additional D-Bus UI for QEMU. + %package ui-gtk Summary: QEMU GTK UI driver Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} @@ -1759,8 +1743,7 @@ for emu in %{buildroot}%{_bindir}/qemu-system-*; do %if %{need_qemu_kvm} ln -sf qemu.1.gz %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz ln -sf qemu-system-x86_64 %{buildroot}%{_bindir}/qemu-kvm -ln -sf %{_bindir}/qemu-system-x86_64 %{buildroot}%{_libexecdir}/qemu-kvm -%endif + %endif # Install binfmt @@ -1991,16 +1974,14 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files audio-alsa %{_libdir}/%{name}/audio-alsa.so +%files audio-dbus +%{_libdir}/%{name}/audio-dbus.so %files audio-oss %{_libdir}/%{name}/audio-oss.so %files audio-pa %{_libdir}/%{name}/audio-pa.so %files audio-sdl %{_libdir}/%{name}/audio-sdl.so -%files audio-dbus -%{_libdir}/%{name}/audio-dbus.so -%files audio-ui -%{_libdir}/%{name}/ui-dbus.so %if %{have_jack} %files audio-jack %{_libdir}/%{name}/audio-jack.so @@ -2009,6 +1990,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %files ui-curses %{_libdir}/%{name}/ui-curses.so +%files ui-dbus +%{_libdir}/%{name}/ui-dbus.so %files ui-gtk %{_libdir}/%{name}/ui-gtk.so %files ui-sdl @@ -2066,7 +2049,7 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %if %{have_kvm} %files kvm -%{_libexecdir}/qemu-kvm +# Deliberately empty %files kvm-core # Deliberately empty