From 4d7e5bc37c8a51f7f73ff9742e28186b57bd846a Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Tue, 22 Nov 2022 11:54:53 +0800 Subject: [PATCH] remove sdl & change SLOF,openbios Requires --- qemu.spec | 147 +++++++++++++++++++----------------------------------- 1 file changed, 52 insertions(+), 95 deletions(-) diff --git a/qemu.spec b/qemu.spec index 7726b3e..d6569c4 100644 --- a/qemu.spec +++ b/qemu.spec @@ -61,7 +61,6 @@ %global have_jack 0 -%global have_sdl_image %{defined anolis} %global have_fdt 1 %global have_opengl 1 %global have_usbredir 1 @@ -117,14 +116,12 @@ %define requires_audio_alsa Requires: %{name}-audio-alsa = %{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} %define requires_char_baum Requires: %{name}-char-baum = %{evr} %define requires_device_usb_host Requires: %{name}-device-usb-host = %{evr} %define requires_device_usb_redirect Requires: %{name}-device-usb-redirect = %{evr} %define requires_device_usb_smartcard Requires: %{name}-device-usb-smartcard = %{evr} %define requires_ui_curses Requires: %{name}-ui-curses = %{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} %define requires_ui_opengl Requires: %{name}-ui-opengl = %{evr} %define requires_device_display_virtio_gpu Requires: %{name}-device-display-virtio-gpu = %{evr} @@ -173,12 +170,10 @@ %{requires_audio_alsa} \ %{requires_audio_oss} \ %{requires_audio_pa} \ -%{requires_audio_sdl} \ %{requires_audio_jack} \ %{requires_audio_spice} \ %{requires_ui_curses} \ %{requires_ui_gtk} \ -%{requires_ui_sdl} \ %{requires_ui_egl_headless} \ %{requires_ui_opengl} \ %{requires_ui_spice_app} \ @@ -209,22 +204,17 @@ Obsoletes: %{name}-system-moxie-core <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-system-unicore32 <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-system-unicore32-core <= %{epoch}:%{version}-%{release} -# Release candidate version tracking -%if 0%{?rcver:1} -%global rcrel .%{rcver} -%global rcstr -%{rcver} -%endif - +%define anolis_release 2 Summary: QEMU is a FAST! processor emulator Name: qemu Version: 6.2.0 -Release: 1%{?rcrel}%{?dist} +Release: %{anolis_release}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ -Source0: http://wiki.qemu-project.org/download/%{name}-%{version}%{?rcstr}.tar.xz +Source0: http://wiki.qemu-project.org/download/%{name}-%{version}.tar.xz Source10: qemu-guest-agent.service Source11: 99-qemu-guest-agent.rules @@ -307,8 +297,6 @@ BuildRequires: libbpf-devel BuildRequires: gcc BuildRequires: make -# -display sdl support -BuildRequires: SDL2-devel # pulseaudio audio output BuildRequires: pulseaudio-libs-devel # alsa audio output @@ -378,9 +366,6 @@ BuildRequires: fuse-devel BuildRequires: jack-audio-connection-kit-devel %endif BuildRequires: fuse3-devel -%if %{have_sdl_image} -BuildRequires: SDL2_image-devel -%endif %if %{user_static} BuildRequires: glibc-static pcre-static glib2-static zlib-static @@ -500,7 +485,7 @@ tests, or qemu-iotests. %package block-curl Summary: QEMU CURL block driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description block-curl This package provides the additional CURL block driver for QEMU. @@ -510,7 +495,7 @@ http, https, ftp and other transports provided by the CURL library. %package block-iscsi Summary: QEMU iSCSI block driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description block-iscsi This package provides the additional iSCSI block driver for QEMU. @@ -520,7 +505,7 @@ Install this package if you want to access iSCSI volumes. %if %{have_block_rbd} %package block-rbd Summary: QEMU Ceph/RBD block driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description block-rbd This package provides the additional Ceph/RBD block driver for QEMU. @@ -531,7 +516,7 @@ using the rbd protocol. %package block-ssh Summary: QEMU SSH block driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description block-ssh This package provides the additional SSH block driver for QEMU. @@ -542,7 +527,7 @@ the Secure Shell (SSH) protocol. %if %{have_opengl} %package ui-opengl Summary: QEMU opengl support -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Requires: mesa-libGL Requires: mesa-libEGL Requires: mesa-dri-drivers @@ -553,7 +538,7 @@ This package provides opengl support. %package block-dmg Summary: QEMU block driver for DMG disk images -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description block-dmg This package provides the additional DMG block driver for QEMU. @@ -563,7 +548,7 @@ Install this package if you want to open '.dmg' files. %if %{have_block_gluster} %package block-gluster Summary: QEMU Gluster block driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description block-gluster This package provides the additional Gluster block driver for QEMU. @@ -574,7 +559,7 @@ Install this package if you want to access remote Gluster storage. %if %{have_block_nfs} %package block-nfs Summary: QEMU NFS block driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description block-nfs This package provides the additional NFS block driver for QEMU. @@ -585,32 +570,26 @@ Install this package if you want to access remote NFS storage. %package audio-alsa Summary: QEMU ALSA audio driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description audio-alsa This package provides the additional ALSA audio driver for QEMU. %package audio-oss Summary: QEMU OSS audio driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description audio-oss This package provides the additional OSS audio driver for QEMU. %package audio-pa Summary: QEMU PulseAudio audio driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description audio-pa This package provides the additional PulseAudi audio driver for QEMU. -%package audio-sdl -Summary: QEMU SDL audio driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -%description audio-sdl -This package provides the additional SDL audio driver for QEMU. - %if %{have_jack} %package audio-jack Summary: QEMU Jack audio driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description audio-jack This package provides the additional Jack audio driver for QEMU. %endif @@ -618,103 +597,96 @@ This package provides the additional Jack audio driver for QEMU. %package ui-curses Summary: QEMU curses UI driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description ui-curses This package provides the additional curses UI for QEMU. %package ui-gtk Summary: QEMU GTK UI driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-opengl%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-opengl = %{epoch}:%{version}-%{release} %description ui-gtk This package provides the additional GTK UI for QEMU. -%package ui-sdl -Summary: QEMU SDL UI driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-opengl%{?_isa} = %{epoch}:%{version}-%{release} -%description ui-sdl -This package provides the additional SDL UI for QEMU. - %package ui-egl-headless Summary: QEMU EGL headless driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-opengl%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-opengl = %{epoch}:%{version}-%{release} %description ui-egl-headless This package provides the additional egl-headless UI for QEMU. %package char-baum Summary: QEMU Baum chardev driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description char-baum This package provides the Baum chardev driver for QEMU. %package device-display-virtio-gpu Summary: QEMU virtio-gpu display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-display-virtio-gpu This package provides the virtio-gpu display device for QEMU. %package device-display-virtio-gpu-gl Summary: QEMU virtio-gpu-gl display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-display-virtio-gpu-gl This package provides the virtio-gpu-gl display device for QEMU. %package device-display-virtio-gpu-pci Summary: QEMU virtio-gpu-pci display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-display-virtio-gpu-pci This package provides the virtio-gpu-pci display device for QEMU. %package device-display-virtio-gpu-pci-gl Summary: QEMU virtio-gpu-pci-gl display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-display-virtio-gpu-pci-gl This package provides the virtio-gpu-pci-gl display device for QEMU. %package device-display-virtio-gpu-ccw Summary: QEMU virtio-gpu-ccw display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-display-virtio-gpu-ccw This package provides the virtio-gpu-ccw display device for QEMU. %package device-display-virtio-vga Summary: QEMU virtio-vga display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-display-virtio-vga This package provides the virtio-vga display device for QEMU. %package device-display-virtio-vga-gl Summary: QEMU virtio-vga-gl display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-display-virtio-vga-gl This package provides the virtio-vga-gl display device for QEMU. %package device-usb-host Summary: QEMU usb host device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-usb-host This package provides the USB pass through driver for QEMU. %package device-usb-redirect Summary: QEMU usbredir device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-usb-redirect This package provides the usbredir device for QEMU. %package device-usb-smartcard Summary: QEMU USB smartcard device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-usb-smartcard This package provides the USB smartcard device for QEMU. %if %{have_virgl} %package device-display-vhost-user-gpu Summary: QEMU QXL display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} %description device-display-vhost-user-gpu This package provides the vhost-user-gpu display device for QEMU. %endif @@ -722,37 +694,37 @@ This package provides the vhost-user-gpu display device for QEMU. %if %{have_spice} %package ui-spice-core Summary: QEMU spice-core UI driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-opengl%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-opengl = %{epoch}:%{version}-%{release} %description ui-spice-core This package provides the additional spice-core UI for QEMU. %package ui-spice-app Summary: QEMU spice-app UI driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-spice-core%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-char-spice%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-spice-core = %{epoch}:%{version}-%{release} +Requires: %{name}-char-spice = %{epoch}:%{version}-%{release} %description ui-spice-app This package provides the additional spice-app UI for QEMU. %package device-display-qxl Summary: QEMU QXL display device -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-spice-core%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-spice-core = %{epoch}:%{version}-%{release} %description device-display-qxl This package provides the QXL display device for QEMU. %package char-spice Summary: QEMU spice chardev driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-spice-core%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-spice-core = %{epoch}:%{version}-%{release} %description char-spice This package provides the spice chardev driver for QEMU. %package audio-spice Summary: QEMU spice audio driver -Requires: %{name}-common%{?_isa} = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-spice-core%{?_isa} = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-ui-spice-core = %{epoch}:%{version}-%{release} %description audio-spice This package provides the spice audio driver for QEMU. %endif @@ -972,8 +944,6 @@ This package provides the QEMU system emulator for PPC and PPC64 systems. %package system-ppc-core Summary: QEMU system emulator for PPC Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: openbios -Requires: SLOF Requires: seavgabios-bin %description system-ppc-core This package provides the QEMU system emulator for PPC and PPC64 systems. @@ -1045,7 +1015,6 @@ This package provides the QEMU system emulator for SPARC and SPARC64 systems. %package system-sparc-core Summary: QEMU system emulator for SPARC Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: openbios %description system-sparc-core This package provides the QEMU system emulator for SPARC and SPARC64 systems. @@ -1105,7 +1074,7 @@ This package provides the QEMU system emulator for Xtensa boards. %prep -%setup -q -n qemu-%{version}%{?rcstr} +%setup -q -n qemu-%{version} %autopatch -p1 %global qemu_kvm_build qemu_kvm_build @@ -1364,7 +1333,7 @@ run_configure \ --enable-xkbcommon \ \ \ - --audio-drv-list=pa,sdl,alsa,%{?jack_drv}oss \ + --audio-drv-list=pa,alsa,%{?jack_drv}oss \ --target-list-exclude=moxie-softmmu \ --with-default-devices \ --enable-auth-pam \ @@ -1399,10 +1368,6 @@ run_configure \ --enable-qed \ --enable-qom-cast-debug \ --enable-replication \ - --enable-sdl \ -%if %{have_sdl_image} - --enable-sdl-image \ -%endif --enable-smartcard \ %if %{have_spice} --enable-spice \ @@ -1572,12 +1537,6 @@ find %{buildroot}%{qemudocdir} -name .buildinfo -delete rm -rf %{buildroot}%{qemudocdir}/specs -# Provided by package openbios -rm -rf %{buildroot}%{_datadir}/%{name}/openbios-ppc -rm -rf %{buildroot}%{_datadir}/%{name}/openbios-sparc32 -rm -rf %{buildroot}%{_datadir}/%{name}/openbios-sparc64 -# Provided by package SLOF -rm -rf %{buildroot}%{_datadir}/%{name}/slof.bin # Provided by package ipxe rm -rf %{buildroot}%{_datadir}/%{name}/pxe*rom rm -rf %{buildroot}%{_datadir}/%{name}/efi*rom @@ -1591,7 +1550,6 @@ rm -rf %{buildroot}%{_datadir}/%{name}/sgabios.bin rm -rf %{buildroot}%{_datadir}/%{name}/edk2* rm -rf %{buildroot}%{_datadir}/%{name}/firmware - # Fedora specific stuff below %find_lang %{name} @@ -1649,8 +1607,6 @@ rm -rf %{static_buildroot} # endif !tools_only %endif - - %check %if %{with check} %if !%{tools_only} @@ -1824,8 +1780,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_libdir}/%{name}/audio-oss.so %files audio-pa %{_libdir}/%{name}/audio-pa.so -%files audio-sdl -%{_libdir}/%{name}/audio-sdl.so %if %{have_jack} %files audio-jack %{_libdir}/%{name}/audio-jack.so @@ -1836,8 +1790,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_libdir}/%{name}/ui-curses.so %files ui-gtk %{_libdir}/%{name}/ui-gtk.so -%files ui-sdl -%{_libdir}/%{name}/ui-sdl.so %files ui-egl-headless %{_libdir}/%{name}/ui-egl-headless.so @@ -1970,7 +1922,6 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_datadir}/systemtap/tapset/qemu-system-aarch64*.stp %{_mandir}/man1/qemu-system-aarch64.1* - %files system-alpha %files system-alpha-core %{_bindir}/qemu-system-alpha @@ -2066,6 +2017,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_datadir}/%{name}/skiboot.lid %{_datadir}/%{name}/u-boot.e500 %{_datadir}/%{name}/u-boot-sam460-20100605.bin +%{_datadir}/%{name}/slof.bin +%{_datadir}/%{name}/openbios-ppc %if %{have_memlock_limits} %{_sysconfdir}/security/limits.d/95-kvm-memlock.conf %endif @@ -2115,7 +2068,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %{_mandir}/man1/qemu-system-sparc64.1* %{_datadir}/%{name}/QEMU,tcx.bin %{_datadir}/%{name}/QEMU,cgthree.bin - +%{_datadir}/%{name}/openbios-sparc32 +%{_datadir}/%{name}/openbios-sparc64 %files system-tricore %files system-tricore-core @@ -2158,5 +2112,8 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %changelog +* Tue Nov 22 2022 mgb01105731 - 6.2.0-2 +- remove sdl & change bios,slof Requires + * Tue Mar 15 2022 forrest_ly - 6.2.0-1 - Init for Anolis OS 23 -- Gitee