diff --git a/libvirt.spec b/libvirt.spec index 86ea771..21a6112 100644 --- a/libvirt.spec +++ b/libvirt.spec @@ -6,7 +6,7 @@ %define min_rhel 9 %define min_fedora 41 -%define arches_qemu_kvm %{ix86} x86_64 %{power64} %{arm} aarch64 s390x riscv64 +%define arches_qemu_kvm %{ix86} x86_64 %{power64} aarch64 s390x riscv64 %if 0%{?rhel} %if 0%{?rhel} >= 10 %define arches_qemu_kvm x86_64 aarch64 s390x riscv64 @@ -32,12 +32,22 @@ %define arches_ch x86_64 aarch64 # The hypervisor drivers that run in libvirtd -%define with_qemu 0%{!?_without_qemu:1} %define with_lxc 0%{!?_without_lxc:1} %define with_libxl 0%{!?_without_libxl:1} %define with_vbox 0%{!?_without_vbox:1} %define with_ch 0%{!?_without_ch:1} +%ifarch %{arches_64bit} + %define with_qemu 0%{!?_without_qemu:1} +%else + # QEMU drops 32-bit in Fedora 44 + %if 0%{?fedora} > 43 + %define with_qemu 0 + %else + %define with_qemu 0%{!?_without_qemu:1} + %endif +%endif + %ifarch %{arches_qemu_kvm} %define with_qemu_kvm %{with_qemu} %else @@ -76,8 +86,10 @@ %define with_storage_gluster 0 %endif -# Fedora had zfs-fuse until F43 -%if 0%{?fedora} && 0%{?fedora} < 43 +# On Fedora 43, the 'zfs-fuse' package was removed, but is obtainable via +# other means. Build the backend, but it's no longer considered to be part +# of 'daemon-driver-storage'. +%if 0%{?fedora} %define with_storage_zfs 0%{!?_without_storage_zfs:1} %else %define with_storage_zfs 0 @@ -91,7 +103,6 @@ # Other optional features %define with_numactl 0%{!?_without_numactl:1} -%define with_userfaultfd_sysctl 0%{!?_without_userfaultfd_sysctl:1} # A few optional bits off by default, we enable later %define with_fuse 0 @@ -259,12 +270,6 @@ %define enable_werror -Dwerror=false -Dgit_werror=disabled %endif -# Fedora and RHEL-9 are new enough to support /dev/userfaultfd, which -# does not require enabling vm.unprivileged_userfaultfd sysctl. -%if 0%{?fedora} || 0%{?rhel} - %define with_userfaultfd_sysctl 0 -%endif - %define tls_priority "@LIBVIRT,SYSTEM" # libvirt 8.1.0 stops distributing any sysconfig files. @@ -288,7 +293,7 @@ Summary: Library providing a simple virtualization API Name: libvirt -Version: 11.9.0 +Version: 11.10.0 Release: 1%{?dist}%{?extra_release} License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1 URL: https://libvirt.org/ @@ -404,7 +409,7 @@ BuildRequires: numactl-devel %endif BuildRequires: libcap-ng-devel >= 0.5.0 %if %{with_fuse} -BuildRequires: fuse-devel >= 2.8.6 +BuildRequires: fuse3-devel %endif %if %{with_libssh2} BuildRequires: libssh2-devel >= 1.3.0 @@ -674,9 +679,6 @@ Requires: /usr/bin/qemu-img Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0 %endif Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0 - %if !%{with_storage_zfs} -Obsoletes: libvirt-daemon-driver-storage-zfs < 11.4.0 - %endif %description daemon-driver-storage-core The storage driver plugin for the libvirtd daemon, providing @@ -777,9 +779,13 @@ volumes using the ceph protocol. Summary: Storage driver plugin for ZFS Requires: libvirt-daemon-driver-storage-core = %{version}-%{release} Requires: libvirt-libs = %{version}-%{release} -# Support any conforming implementation of zfs +# Starting with Fedora 43 the 'zfs-fuse' is no longer shipped but obtainable +# externally. The package builds fine without these. Users will have to provide +# their own implementation. + %if 0%{?fedora} && 0%{?fedora} < 43 Requires: /sbin/zfs Requires: /sbin/zpool + %endif %description daemon-driver-storage-zfs The storage driver backend adding implementation of the storage APIs for @@ -803,7 +809,10 @@ Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release} %if %{with_storage_rbd} Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release} %endif - %if %{with_storage_zfs} +# Starting with Fedora 43 the 'zfs-fuse' is no longer shipped but obtainable +# externally. We do not want to install this as part of 'daemon-driver-storage' +# any more. + %if %{with_storage_zfs} && 0%{?fedora} && 0%{?fedora} < 43 Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release} %endif @@ -1329,12 +1338,6 @@ exit 1 %define arg_remote_mode -Dremote_default_mode=legacy %endif -%if %{with_userfaultfd_sysctl} - %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=enabled -%else - %define arg_userfaultfd_sysctl -Duserfaultfd_sysctl=disabled -%endif - %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1418,7 +1421,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) -Dqemu_datadir=%{qemu_datadir} \ -Dtls_priority=%{tls_priority} \ -Dsysctl_config=enabled \ - %{?arg_userfaultfd_sysctl} \ -Dssh_proxy=enabled \ %{?enable_werror} \ -Dexpensive_tests=enabled \ @@ -1506,7 +1508,6 @@ export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec) -Dstorage_vstorage=disabled \ -Dstorage_zfs=disabled \ -Dsysctl_config=disabled \ - -Duserfaultfd_sysctl=disabled \ -Dssh_proxy=disabled \ -Dtests=disabled \ -Dudev=disabled \ @@ -2314,9 +2315,6 @@ exit 0 %if %{with_qemu} %files daemon-driver-qemu %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf - %if %{with_userfaultfd_sysctl} -%config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf - %endif %{_datadir}/augeas/lenses/virtqemud.aug %{_datadir}/augeas/lenses/tests/test_virtqemud.aug %{_unitdir}/virtqemud.service @@ -2691,6 +2689,12 @@ exit 0 %endif %changelog +* Tue Dec 2 2025 Jiri Denemark - 11.10.0-1 +- Rebased to libvirt-11.10.0 (RHEL-118197) +- The rebase also fixes the following bugs: + RHEL-126090, RHEL-128107 +- spec: Fix RPM build when %{fedora} is undefined (RHEL-118197) + * Tue Nov 4 2025 Jiri Denemark - 11.9.0-1 - Rebased to libvirt-11.9.0 (RHEL-118197) - The rebase also fixes the following bugs: diff --git a/sources b/sources index db3e0b2..6c1ed68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libvirt-11.9.0.tar.xz) = b1965bdcf9c0c9e7977787451b44e5ffb509ce19f79c3d7a0eca1929c3db1e0f3417abf8e67a121efee8bf2a18000c8b11812c7a8582989af51e03450f6ba5c8 +SHA512 (libvirt-11.10.0.tar.xz) = c494aa45c3989a36830d3c8b8d24ef04d5e747ea2187abb61bf72f00ab827847050da361fcf1b173bd3fa29183172798dfb2770ed04e33c2470a28bc4a976cd9