diff --git a/qemu-7.2.4.tar.xz b/qemu-7.2.4.tar.xz deleted file mode 100644 index 5f2454c973291a3d58f3203cef336a4f771f14bc..0000000000000000000000000000000000000000 Binary files a/qemu-7.2.4.tar.xz and /dev/null differ diff --git a/qemu-7.2.5.tar.xz b/qemu-7.2.5.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..5446897b62cbd1abdfecdf1550a59aa85a167f67 --- /dev/null +++ b/qemu-7.2.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:172042aa37609240130fe03f5925001e717d74dbd0799adf15b15dc038aef9d1 +size 121329976 diff --git a/qemu.spec b/qemu.spec index fd9c2d05b334689f2db70c82dca788a531e62dea..68513780c1bb27aba464f3272471a2a95f05db49 100644 --- a/qemu.spec +++ b/qemu.spec @@ -3,10 +3,10 @@ %bcond_with check %global libfdt_version 1.6.0 -%global libseccomp_version 2.4.0 +%global libseccomp_version 2.3.0 %global libusbx_version 1.0.23 -%global meson_version 0.58.2 -%global usbredir_version 0.7.1 +%global meson_version 0.61.3 +%global usbredir_version 0.6 %global ipxe_version 20200823-5.git4bd064de %global have_memlock_limits 0 @@ -239,14 +239,14 @@ Obsoletes: %{name}-system-xtensa-core <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-system-hppa <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-system-hppa-core <= %{epoch}:%{version}-%{release} \ Obsoletes: %{name}-ui-sdl <= %{epoch}:%{version}-%{release} \ -Obsoletes: %{name}-audio-sdl <= %{epoch}:%{version}-%{release} +Obsoletes: %{name}-audio-sdl <= %{epoch}:%{version}-%{release} Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 7.2.4 +Version: 7.2.5 Release: %{anolis_release}%{?dist} -Epoch: 2 +Epoch: 15 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -401,17 +401,20 @@ BuildRequires: fuse3-devel BuildRequires: glibc-static pcre-static glib2-static zlib-static %endif -Requires: %{name}-user = %{epoch}:%{version}-%{release} -Requires: %{name}-system-aarch64 = %{epoch}:%{version}-%{release} -Requires: %{name}-system-arm = %{epoch}:%{version}-%{release} -Requires: %{name}-system-loongarch64 = %{epoch}:%{version}-%{release} -Requires: %{name}-system-riscv = %{epoch}:%{version}-%{release} -Requires: %{name}-system-x86 = %{epoch}:%{version}-%{release} -Requires: %{name}-img = %{epoch}:%{version}-%{release} -Requires: %{name}-tools = %{epoch}:%{version}-%{release} -Requires: qemu-pr-helper = %{epoch}:%{version}-%{release} +Requires: %{name}-user = %{EVR} +Requires: %{name}-system-aarch64 = %{EVR} +Requires: %{name}-system-arm = %{EVR} +Requires: %{name}-system-loongarch64 = %{EVR} +Requires: %{name}-system-riscv = %{EVR} +Requires: %{name}-system-x86 = %{EVR} +Requires: %{name}-img = %{EVR} +Requires: %{name}-tools = %{EVR} +Requires: qemu-pr-helper = %{EVR} Requires: vhostuser-backend(fs) +# Begin with Anolis 23, qemu-kvm was changed to a meta package rather than +# a package containing actual files. So conflicting with older distro. +Conflicts: (qemu-kvm < %{EVR} and anolis-release < 23) %description %{name} is an open source virtualizer that provides hardware @@ -429,6 +432,8 @@ Requires(preun): systemd-units Requires(postun): systemd-units %{obsoletes_some_modules} Requires: ipxe-roms-qemu >= %{ipxe_version} +Obsoletes: qemu-kvm-common < %{EVR} + %description common %{name} is an open source virtualizer that provides hardware emulation for the KVM hypervisor. @@ -438,6 +443,8 @@ This package provides documentation and auxiliary programs used with %{name}. %package docs Summary: %{name} documentation +Obsoletes: qemu-kvm-docs < %{EVR} + %description docs %{name}-docs provides documentation files regarding %{name}. @@ -465,6 +472,7 @@ This package does not need to be installed on the host OS. %package tools Summary: %{name} support tools +Obsoletes: qemu-kvm-tools < %{EVR} %description tools %{name}-tools provides various tools related to %{name} usage. @@ -487,7 +495,8 @@ tree with a guest. %package tests Summary: tests for the %{name} package -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{EVR} +Obsoletes: qemu-kvm-tests < %{EVR} %define testsdir %{_libdir}/%{name}/tests-src @@ -501,7 +510,8 @@ tests, or qemu-iotests. %package block-curl Summary: QEMU CURL block driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-block-curl < %{EVR} %description block-curl This package provides the additional CURL block driver for QEMU. @@ -511,7 +521,8 @@ http, https, ftp and other transports provided by the CURL library. %package block-iscsi Summary: QEMU iSCSI block driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-block-iscsi < %{EVR} %description block-iscsi This package provides the additional iSCSI block driver for QEMU. @@ -521,7 +532,8 @@ 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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-block-rbd < %{EVR} %description block-rbd This package provides the additional Ceph/RBD block driver for QEMU. @@ -532,7 +544,8 @@ using the rbd protocol. %package block-ssh Summary: QEMU SSH block driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-block-ssh < %{EVR} %description block-ssh This package provides the additional SSH block driver for QEMU. @@ -543,10 +556,11 @@ the Secure Shell (SSH) protocol. %if %{have_opengl} %package ui-opengl Summary: QEMU opengl support -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} Requires: mesa-libGL Requires: mesa-libEGL Requires: mesa-dri-drivers +Obsoletes: qemu-kvm-ui-opengl < %{EVR} %description ui-opengl This package provides opengl support. %endif @@ -554,7 +568,8 @@ This package provides opengl support. %package block-dmg Summary: QEMU block driver for DMG disk images -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-block-dmg < %{EVR} %description block-dmg This package provides the additional DMG block driver for QEMU. @@ -564,7 +579,8 @@ 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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-block-gluster < %{EVR} %description block-gluster This package provides the additional Gluster block driver for QEMU. @@ -575,7 +591,8 @@ 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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-block-nfs < %{EVR} %description block-nfs This package provides the additional NFS block driver for QEMU. @@ -586,32 +603,37 @@ Install this package if you want to access remote NFS storage. %package audio-alsa Summary: QEMU ALSA audio driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-audio-alsa < %{EVR} %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} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-audio-dbus < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-audio-oss < %{EVR} %description audio-oss This package provides the additional OSS audio driver for QEMU. %package audio-pa Summary: QEMU PulseAudio audio driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-audio-pa < %{EVR} %description audio-pa This package provides the additional PulseAudi audio driver for QEMU. %if %{have_jack} %package audio-jack Summary: QEMU Jack audio driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-audio-jack < %{EVR} %description audio-jack This package provides the additional Jack audio driver for QEMU. %endif @@ -619,104 +641,120 @@ This package provides the additional Jack audio driver for QEMU. %package ui-curses Summary: QEMU curses UI driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-ui-curses < %{EVR} %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} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-ui-dbus < %{EVR} %description ui-dbus This package provides the additional D-Bus UI for QEMU. %package ui-gtk Summary: QEMU GTK UI driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-opengl = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Requires: %{name}-ui-opengl = %{EVR} +Obsoletes: qemu-kvm-ui-gtk < %{EVR} %description ui-gtk This package provides the additional GTK UI for QEMU. %package ui-egl-headless Summary: QEMU EGL headless driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-opengl = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Requires: %{name}-ui-opengl = %{EVR} +Obsoletes: qemu-kvm-ui-egl-headless < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-char-baum < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-display-virtio-gpu < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-display-virtio-gpu-gl < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-display-virtio-gpu-pci < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-display-virtio-gpu-pci-gl < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-display-virtio-gpu-ccw < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-display-virtio-vga < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-display-virtio-vga-gl < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-usb-host < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-usb-redirect < %{EVR} %description device-usb-redirect This package provides the usbredir device for QEMU. %package device-usb-smartcard Summary: QEMU USB smartcard device -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-usb-smartcard < %{EVR} %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 = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-device-display-vhost-user-gpu < %{EVR} %description device-display-vhost-user-gpu This package provides the vhost-user-gpu display device for QEMU. %endif @@ -724,37 +762,42 @@ 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 = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-opengl = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Requires: %{name}-ui-opengl = %{EVR} +Obsoletes: qemu-kvm-ui-spice-core < %{EVR} %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 = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-spice-core = %{epoch}:%{version}-%{release} -Requires: %{name}-char-spice = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Requires: %{name}-ui-spice-core = %{EVR} +Requires: %{name}-char-spice = %{EVR} +Obsoletes: qemu-kvm-ui-spice-app < %{EVR} %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 = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-spice-core = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Requires: %{name}-ui-spice-core = %{EVR} +Obsoletes: qemu-kvm-device-display-qxl < %{EVR} %description device-display-qxl This package provides the QXL display device for QEMU. %package char-spice Summary: QEMU spice chardev driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-spice-core = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Requires: %{name}-ui-spice-core = %{EVR} +Obsoletes: qemu-kvm-char-spice < %{EVR} %description char-spice This package provides the spice chardev driver for QEMU. %package audio-spice Summary: QEMU spice audio driver -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: %{name}-ui-spice-core = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Requires: %{name}-ui-spice-core = %{EVR} +Obsoletes: qemu-kvm-audio-spice < %{EVR} %description audio-spice This package provides the spice audio driver for QEMU. %endif @@ -763,7 +806,7 @@ This package provides the spice audio driver for QEMU. %if %{have_kvm} %package kvm Summary: QEMU metapackage for KVM support -Requires: qemu-%{kvm_package} = %{epoch}:%{version}-%{release} +Requires: qemu-%{kvm_package} = %{EVR} %description kvm This is a meta-package that provides a qemu-system- package for native architectures where kvm can be enabled. For example, in an x86 system, this @@ -772,7 +815,7 @@ will install qemu-system-x86 %package kvm-core Summary: QEMU metapackage for KVM support -Requires: qemu-%{kvm_package}-core = %{epoch}:%{version}-%{release} +Requires: qemu-%{kvm_package}-core = %{EVR} %description kvm-core This is a meta-package that provides a qemu-system--core package for native architectures where kvm can be enabled. For example, in an @@ -782,14 +825,14 @@ x86 system, this will install qemu-system-x86-core %package user Summary: QEMU user mode emulation of qemu targets -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} %description user This package provides the user mode emulation of qemu targets %package user-binfmt Summary: QEMU user mode emulation of qemu targets -Requires: %{name}-user = %{epoch}:%{version}-%{release} +Requires: %{name}-user = %{EVR} Requires(post): systemd-units Requires(postun): systemd-units %description user-binfmt @@ -798,7 +841,8 @@ This package provides the user mode emulation of qemu targets %if %{user_static} %package user-static Summary: QEMU user mode emulation of qemu targets static build -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} +Obsoletes: qemu-kvm-user-static < %{EVR} Requires(post): systemd-units Requires(postun): systemd-units %description user-static @@ -809,14 +853,14 @@ static binaries %package system-aarch64 Summary: QEMU system emulator for AArch64 -Requires: %{name}-system-aarch64-core = %{epoch}:%{version}-%{release} +Requires: %{name}-system-aarch64-core = %{EVR} %{requires_all_modules} %description system-aarch64 This package provides the QEMU system emulator for AArch64. %package system-aarch64-core Summary: QEMU system emulator for AArch64 -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} %if %{have_edk2} Requires: edk2-aarch64 %endif @@ -825,49 +869,49 @@ This package provides the QEMU system emulator for AArch64. %package system-arm Summary: QEMU system emulator for ARM -Requires: %{name}-system-arm-core = %{epoch}:%{version}-%{release} +Requires: %{name}-system-arm-core = %{EVR} %{requires_all_modules} %description system-arm This package provides the QEMU system emulator for ARM systems. %package system-arm-core Summary: QEMU system emulator for ARM -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} %description system-arm-core This package provides the QEMU system emulator for ARM boards. %package system-loongarch64 Summary: QEMU system emulator for LoongArch (LA64) -Requires: %{name}-system-loongarch64-core = %{epoch}:%{version}-%{release} +Requires: %{name}-system-loongarch64-core = %{EVR} %{requires_all_modules} %description system-loongarch64 This package provides the QEMU system emulator for Loongson boards. %package system-loongarch64-core Summary: QEMU system emulator for LoongArch (LA64) -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} %description system-loongarch64-core This package provides the QEMU system emulator for Loongson boards. %package system-riscv Summary: QEMU system emulator for RISC-V -Requires: %{name}-system-riscv-core = %{epoch}:%{version}-%{release} +Requires: %{name}-system-riscv-core = %{EVR} %{requires_all_modules} %description system-riscv This package provides the QEMU system emulator for RISC-V systems. %package system-riscv-core Summary: QEMU system emulator for RISC-V -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} %description system-riscv-core This package provides the QEMU system emulator for RISC-V systems. %package system-x86 Summary: QEMU system emulator for x86 -Requires: %{name}-system-x86-core = %{epoch}:%{version}-%{release} +Requires: %{name}-system-x86-core = %{EVR} %{requires_all_modules} %description system-x86 This package provides the QEMU system emulator for x86. When being run in a x86 @@ -876,7 +920,7 @@ platform. %package system-x86-core Summary: QEMU system emulator for x86 -Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: %{name}-common = %{EVR} Requires: seabios-bin Requires: sgabios-bin Requires: seavgabios-bin @@ -1786,6 +1830,9 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ %endif %changelog +* Sat Aug 12 2023 Funda Wang - 15:7.2.5-1 +- New version 7.2.5 + * Wed Jul 12 2023 Funda Wang - 2:7.2.4-1 - New version 7.2.4