Browse Source

Backport packages from upstream

main
Nicolas Massé 3 weeks ago
committed by github-actions[bot]
parent
commit
12bb24652b
  1. 3
      fedora-42/SOURCES/zfs-2.4.1.tar.gz
  2. 14
      fedora-42/SPECS/zfs-dkms.spec
  3. 2
      fedora-42/SPECS/zfs.spec
  4. 3
      fedora-43/SOURCES/zfs-2.4.1.tar.gz
  5. 19
      fedora-43/SPECS/libvirt.spec
  6. 14
      fedora-43/SPECS/zfs-dkms.spec
  7. 2
      fedora-43/SPECS/zfs.spec

3
fedora-42/SOURCES/zfs-2.4.1.tar.gz

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a9080ce03a91550cb0405c3466a3a1dc6bf29b8a62cf6ea44a1f53a465021991
size 34497242

14
fedora-42/SPECS/zfs-dkms.spec

@ -12,7 +12,7 @@
Name: %{module}-dkms
Version: 2.4.0
Version: 2.4.1
Release: 1%{?dist}
Summary: Kernel module(s) (dkms)
@ -32,12 +32,12 @@ Requires(post): gcc, make, perl, diffutils
# Hold back kernel upgrades if kernel is not supported by ZFS
%if 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version}%{?openEuler}
Requires: kernel-devel >= 4.18, kernel-devel <= 6.18.999
Requires(post): kernel-devel >= 4.18, kernel-devel <= 6.18.999
Conflicts: kernel-devel < 4.18, kernel-devel > 6.18.999
Requires: kernel-uname-r >= 4.18, kernel-uname-r <= 6.18.999
Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 6.18.999
Conflicts: kernel-uname-r < 4.18, kernel-uname-r > 6.18.999
Requires: kernel-devel >= 4.18, kernel-devel <= 6.19.999
Requires(post): kernel-devel >= 4.18, kernel-devel <= 6.19.999
Conflicts: kernel-devel < 4.18, kernel-devel > 6.19.999
Requires: kernel-uname-r >= 4.18, kernel-uname-r <= 6.19.999
Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 6.19.999
Conflicts: kernel-uname-r < 4.18, kernel-uname-r > 6.19.999
Obsoletes: spl-dkms <= %{version}
%endif

2
fedora-42/SPECS/zfs.spec

@ -102,7 +102,7 @@ sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix})
print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))")
Name: zfs
Version: 2.4.0
Version: 2.4.1
Release: 1%{?dist}
Summary: Commands to control the kernel modules and libraries

3
fedora-43/SOURCES/zfs-2.4.1.tar.gz

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d6c3ea2775b87b1d1f7756a811c04c94470ac67665941f062de10ea226d322f
size 34508446

19
fedora-43/SPECS/libvirt.spec

@ -284,7 +284,7 @@
Summary: Library providing a simple virtualization API
Name: libvirt
Version: 11.6.0
Release: 2%{?dist}
Release: 3%{?dist}
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/
@ -679,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
@ -782,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
@ -808,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
@ -2694,6 +2698,9 @@ exit 0
%changelog
* Mon Feb 16 2026 Daniel P. Berrangé <berrange@redhat.com> - 11.6.0-3
- Re-enable ZFS (rhbz#2407005)
* Fri Oct 31 2025 Cole Robinson <crobinso@redhat.com> - 11.6.0-2
- Fix build with latest wireshark

14
fedora-43/SPECS/zfs-dkms.spec

@ -12,7 +12,7 @@
Name: %{module}-dkms
Version: 2.4.0
Version: 2.4.1
Release: 1%{?dist}
Summary: Kernel module(s) (dkms)
@ -32,12 +32,12 @@ Requires(post): gcc, make, perl, diffutils
# Hold back kernel upgrades if kernel is not supported by ZFS
%if 0%{?rhel}%{?fedora}%{?mageia}%{?suse_version}%{?openEuler}
Requires: kernel-devel >= 4.18, kernel-devel <= 6.18.999
Requires(post): kernel-devel >= 4.18, kernel-devel <= 6.18.999
Conflicts: kernel-devel < 4.18, kernel-devel > 6.18.999
Requires: kernel-uname-r >= 4.18, kernel-uname-r <= 6.18.999
Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 6.18.999
Conflicts: kernel-uname-r < 4.18, kernel-uname-r > 6.18.999
Requires: kernel-devel >= 4.18, kernel-devel <= 6.19.999
Requires(post): kernel-devel >= 4.18, kernel-devel <= 6.19.999
Conflicts: kernel-devel < 4.18, kernel-devel > 6.19.999
Requires: kernel-uname-r >= 4.18, kernel-uname-r <= 6.19.999
Requires(post): kernel-uname-r >= 4.18, kernel-uname-r <= 6.19.999
Conflicts: kernel-uname-r < 4.18, kernel-uname-r > 6.19.999
Obsoletes: spl-dkms <= %{version}
%endif

2
fedora-43/SPECS/zfs.spec

@ -102,7 +102,7 @@ sitedir = sysconfig.get_path('purelib', scheme, vars={'base': prefix})
print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))")
Name: zfs
Version: 2.4.0
Version: 2.4.1
Release: 1%{?dist}
Summary: Commands to control the kernel modules and libraries

Loading…
Cancel
Save