nicolas
/
zfs-aarch64
mirror of https://github.com/nmasse-itix/zfs-aarch64.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Backport packages from upstream

main
Nicolas Massé 2 months ago
committed by github-actions[bot]
parent
a8653a6278
commit
aa1a2c8ff5
9 changed files with 111 additions and 96 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      fedora-41/SOURCES/zfs-2.4.0.tar.gz
  2. 14
      fedora-41/SPECS/zfs-dkms.spec
  3. 52
      fedora-41/SPECS/zfs.spec
  4. 3
      fedora-42/SOURCES/zfs-2.4.0.tar.gz
  5. 14
      fedora-42/SPECS/zfs-dkms.spec
  6. 52
      fedora-42/SPECS/zfs.spec
  7. 3
      fedora-43/SOURCES/zfs-2.4.0.tar.gz
  8. 14
      fedora-43/SPECS/zfs-dkms.spec
  9. 52
      fedora-43/SPECS/zfs.spec

3
fedora-41/SOURCES/zfs-2.4.0.tar.gz
View File

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

14
fedora-41/SPECS/zfs-dkms.spec
View File

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

52
fedora-41/SPECS/zfs.spec
View File

@ -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))") print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))")
Name: zfs Name: zfs
Version: 2.3.5 Version: 2.4.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Commands to control the kernel modules and libraries Summary: Commands to control the kernel modules and libraries
@ -111,10 +111,10 @@ License: CDDL
URL: https://github.com/openzfs/zfs URL: https://github.com/openzfs/zfs
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libzpool6%{?_isa} = %{version}-%{release} Requires: libzpool7%{?_isa} = %{version}-%{release}
Requires: libnvpair3%{?_isa} = %{version}-%{release} Requires: libnvpair3%{?_isa} = %{version}-%{release}
Requires: libuutil3%{?_isa} = %{version}-%{release} Requires: libuutil3%{?_isa} = %{version}-%{release}
Requires: libzfs6%{?_isa} = %{version}-%{release} Requires: libzfs7%{?_isa} = %{version}-%{release}
Requires: %{name}-kmod = %{version} Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}-%{release} Provides: %{name}-kmod-common = %{version}-%{release}
Obsoletes: spl <= %{version} Obsoletes: spl <= %{version}
@ -162,22 +162,23 @@ Requires: sysstat
%description %description
This package contains the core ZFS command line utilities. This package contains the core ZFS command line utilities.
%package -n libzpool6 %package -n libzpool7
Summary: Native ZFS pool library for Linux Summary: Native ZFS pool library for Linux
Group: System Environment/Kernel Group: System Environment/Kernel
Obsoletes: libzpool2 <= %{version} Obsoletes: libzpool2 <= %{version}
Obsoletes: libzpool4 <= %{version} Obsoletes: libzpool4 <= %{version}
Obsoletes: libzpool5 <= %{version} Obsoletes: libzpool5 <= %{version}
Obsoletes: libzpool6 <= %{version}
%description -n libzpool6 %description -n libzpool7
This package contains the zpool library, which provides support This package contains the zpool library, which provides support
for managing zpools for managing zpools
%if %{defined ldconfig_scriptlets} %if %{defined ldconfig_scriptlets}
%ldconfig_scriptlets -n libzpool6 %ldconfig_scriptlets -n libzpool7
%else %else
%post -n libzpool6 -p /sbin/ldconfig %post -n libzpool7 -p /sbin/ldconfig
%postun -n libzpool6 -p /sbin/ldconfig %postun -n libzpool7 -p /sbin/ldconfig
%endif %endif
%package -n libnvpair3 %package -n libnvpair3
@ -224,31 +225,32 @@ This library provides a variety of compatibility functions for OpenZFS:
# The library version is encoded in the package name. When updating the # The library version is encoded in the package name. When updating the
# version information it is important to add an obsoletes line below for # version information it is important to add an obsoletes line below for
# the previous version of the package. # the previous version of the package.
%package -n libzfs6 %package -n libzfs7
Summary: Native ZFS filesystem library for Linux Summary: Native ZFS filesystem library for Linux
Group: System Environment/Kernel Group: System Environment/Kernel
Obsoletes: libzfs2 <= %{version} Obsoletes: libzfs2 <= %{version}
Obsoletes: libzfs4 <= %{version} Obsoletes: libzfs4 <= %{version}
Obsoletes: libzfs5 <= %{version} Obsoletes: libzfs5 <= %{version}
Obsoletes: libzfs6 <= %{version}
%description -n libzfs6 %description -n libzfs7
This package provides support for managing ZFS filesystems This package provides support for managing ZFS filesystems
%if %{defined ldconfig_scriptlets} %if %{defined ldconfig_scriptlets}
%ldconfig_scriptlets -n libzfs6 %ldconfig_scriptlets -n libzfs7
%else %else
%post -n libzfs6 -p /sbin/ldconfig %post -n libzfs7 -p /sbin/ldconfig
%postun -n libzfs6 -p /sbin/ldconfig %postun -n libzfs7 -p /sbin/ldconfig
%endif %endif
%package -n libzfs6-devel %package -n libzfs7-devel
Summary: Development headers Summary: Development headers
Group: System Environment/Kernel Group: System Environment/Kernel
Requires: libzfs6%{?_isa} = %{version}-%{release} Requires: libzfs7%{?_isa} = %{version}-%{release}
Requires: libzpool6%{?_isa} = %{version}-%{release} Requires: libzpool7%{?_isa} = %{version}-%{release}
Requires: libnvpair3%{?_isa} = %{version}-%{release} Requires: libnvpair3%{?_isa} = %{version}-%{release}
Requires: libuutil3%{?_isa} = %{version}-%{release} Requires: libuutil3%{?_isa} = %{version}-%{release}
Provides: libzpool6-devel = %{version}-%{release} Provides: libzpool7-devel = %{version}-%{release}
Provides: libnvpair3-devel = %{version}-%{release} Provides: libnvpair3-devel = %{version}-%{release}
Provides: libuutil3-devel = %{version}-%{release} Provides: libuutil3-devel = %{version}-%{release}
Obsoletes: zfs-devel <= %{version} Obsoletes: zfs-devel <= %{version}
@ -256,7 +258,7 @@ Obsoletes: libzfs2-devel <= %{version}
Obsoletes: libzfs4-devel <= %{version} Obsoletes: libzfs4-devel <= %{version}
Obsoletes: libzfs5-devel <= %{version} Obsoletes: libzfs5-devel <= %{version}
%description -n libzfs6-devel %description -n libzfs7-devel
This package contains the header files needed for building additional This package contains the header files needed for building additional
applications against the ZFS libraries. applications against the ZFS libraries.
@ -305,7 +307,7 @@ Summary: Python %{python_version} wrapper for libzfs_core
Group: Development/Languages/Python Group: Development/Languages/Python
License: Apache-2.0 License: Apache-2.0
BuildArch: noarch BuildArch: noarch
Requires: libzfs6 = %{version}-%{release} Requires: libzfs7 = %{version}-%{release}
Requires: libnvpair3 = %{version}-%{release} Requires: libnvpair3 = %{version}-%{release}
Requires: libffi Requires: libffi
Requires: python%{__python_pkg_version} Requires: python%{__python_pkg_version}
@ -433,7 +435,7 @@ make install DESTDIR=%{?buildroot}
find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \; find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
%if 0%{!?__brp_mangle_shebangs:1} %if 0%{!?__brp_mangle_shebangs:1}
find %{?buildroot}%{_bindir} \ find %{?buildroot}%{_bindir} \
\( -name arc_summary -or -name arcstat -or -name dbufstat \ \( -name zarcsummary -or -name zarcstat -or -name dbufstat \
-or -name zilstat \) \ -or -name zilstat \) \
-exec %{__sed} -i 's|^#!.*|#!%{__python}|' {} \; -exec %{__sed} -i 's|^#!.*|#!%{__python}|' {} \;
find %{?buildroot}%{_datadir} \ find %{?buildroot}%{_datadir} \
@ -508,8 +510,8 @@ systemctl --system daemon-reload >/dev/null || true
%{_bindir}/raidz_test %{_bindir}/raidz_test
%{_bindir}/zvol_wait %{_bindir}/zvol_wait
# Optional Python 3 scripts # Optional Python 3 scripts
%{_bindir}/arc_summary %{_bindir}/zarcsummary
%{_bindir}/arcstat %{_bindir}/zarcstat
%{_bindir}/dbufstat %{_bindir}/dbufstat
%{_bindir}/zilstat %{_bindir}/zilstat
# Man pages # Man pages
@ -548,7 +550,7 @@ systemctl --system daemon-reload >/dev/null || true
%config(noreplace) %{_bashcompletiondir}/zfs %config(noreplace) %{_bashcompletiondir}/zfs
%config(noreplace) %{_bashcompletiondir}/zpool %config(noreplace) %{_bashcompletiondir}/zpool
%files -n libzpool6 %files -n libzpool7
%{_libdir}/libzpool.so.* %{_libdir}/libzpool.so.*
%files -n libnvpair3 %files -n libnvpair3
@ -557,10 +559,10 @@ systemctl --system daemon-reload >/dev/null || true
%files -n libuutil3 %files -n libuutil3
%{_libdir}/libuutil.so.* %{_libdir}/libuutil.so.*
%files -n libzfs6 %files -n libzfs7
%{_libdir}/libzfs*.so.* %{_libdir}/libzfs*.so.*
%files -n libzfs6-devel %files -n libzfs7-devel
%{_pkgconfigdir}/libzfs.pc %{_pkgconfigdir}/libzfs.pc
%{_pkgconfigdir}/libzfsbootenv.pc %{_pkgconfigdir}/libzfsbootenv.pc
%{_pkgconfigdir}/libzfs_core.pc %{_pkgconfigdir}/libzfs_core.pc

3
fedora-42/SOURCES/zfs-2.4.0.tar.gz
View File

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

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

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

52
fedora-42/SPECS/zfs.spec
View File

@ -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))") print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))")
Name: zfs Name: zfs
Version: 2.3.5 Version: 2.4.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Commands to control the kernel modules and libraries Summary: Commands to control the kernel modules and libraries
@ -111,10 +111,10 @@ License: CDDL
URL: https://github.com/openzfs/zfs URL: https://github.com/openzfs/zfs
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libzpool6%{?_isa} = %{version}-%{release} Requires: libzpool7%{?_isa} = %{version}-%{release}
Requires: libnvpair3%{?_isa} = %{version}-%{release} Requires: libnvpair3%{?_isa} = %{version}-%{release}
Requires: libuutil3%{?_isa} = %{version}-%{release} Requires: libuutil3%{?_isa} = %{version}-%{release}
Requires: libzfs6%{?_isa} = %{version}-%{release} Requires: libzfs7%{?_isa} = %{version}-%{release}
Requires: %{name}-kmod = %{version} Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}-%{release} Provides: %{name}-kmod-common = %{version}-%{release}
Obsoletes: spl <= %{version} Obsoletes: spl <= %{version}
@ -162,22 +162,23 @@ Requires: sysstat
%description %description
This package contains the core ZFS command line utilities. This package contains the core ZFS command line utilities.
%package -n libzpool6 %package -n libzpool7
Summary: Native ZFS pool library for Linux Summary: Native ZFS pool library for Linux
Group: System Environment/Kernel Group: System Environment/Kernel
Obsoletes: libzpool2 <= %{version} Obsoletes: libzpool2 <= %{version}
Obsoletes: libzpool4 <= %{version} Obsoletes: libzpool4 <= %{version}
Obsoletes: libzpool5 <= %{version} Obsoletes: libzpool5 <= %{version}
Obsoletes: libzpool6 <= %{version}
%description -n libzpool6 %description -n libzpool7
This package contains the zpool library, which provides support This package contains the zpool library, which provides support
for managing zpools for managing zpools
%if %{defined ldconfig_scriptlets} %if %{defined ldconfig_scriptlets}
%ldconfig_scriptlets -n libzpool6 %ldconfig_scriptlets -n libzpool7
%else %else
%post -n libzpool6 -p /sbin/ldconfig %post -n libzpool7 -p /sbin/ldconfig
%postun -n libzpool6 -p /sbin/ldconfig %postun -n libzpool7 -p /sbin/ldconfig
%endif %endif
%package -n libnvpair3 %package -n libnvpair3
@ -224,31 +225,32 @@ This library provides a variety of compatibility functions for OpenZFS:
# The library version is encoded in the package name. When updating the # The library version is encoded in the package name. When updating the
# version information it is important to add an obsoletes line below for # version information it is important to add an obsoletes line below for
# the previous version of the package. # the previous version of the package.
%package -n libzfs6 %package -n libzfs7
Summary: Native ZFS filesystem library for Linux Summary: Native ZFS filesystem library for Linux
Group: System Environment/Kernel Group: System Environment/Kernel
Obsoletes: libzfs2 <= %{version} Obsoletes: libzfs2 <= %{version}
Obsoletes: libzfs4 <= %{version} Obsoletes: libzfs4 <= %{version}
Obsoletes: libzfs5 <= %{version} Obsoletes: libzfs5 <= %{version}
Obsoletes: libzfs6 <= %{version}
%description -n libzfs6 %description -n libzfs7
This package provides support for managing ZFS filesystems This package provides support for managing ZFS filesystems
%if %{defined ldconfig_scriptlets} %if %{defined ldconfig_scriptlets}
%ldconfig_scriptlets -n libzfs6 %ldconfig_scriptlets -n libzfs7
%else %else
%post -n libzfs6 -p /sbin/ldconfig %post -n libzfs7 -p /sbin/ldconfig
%postun -n libzfs6 -p /sbin/ldconfig %postun -n libzfs7 -p /sbin/ldconfig
%endif %endif
%package -n libzfs6-devel %package -n libzfs7-devel
Summary: Development headers Summary: Development headers
Group: System Environment/Kernel Group: System Environment/Kernel
Requires: libzfs6%{?_isa} = %{version}-%{release} Requires: libzfs7%{?_isa} = %{version}-%{release}
Requires: libzpool6%{?_isa} = %{version}-%{release} Requires: libzpool7%{?_isa} = %{version}-%{release}
Requires: libnvpair3%{?_isa} = %{version}-%{release} Requires: libnvpair3%{?_isa} = %{version}-%{release}
Requires: libuutil3%{?_isa} = %{version}-%{release} Requires: libuutil3%{?_isa} = %{version}-%{release}
Provides: libzpool6-devel = %{version}-%{release} Provides: libzpool7-devel = %{version}-%{release}
Provides: libnvpair3-devel = %{version}-%{release} Provides: libnvpair3-devel = %{version}-%{release}
Provides: libuutil3-devel = %{version}-%{release} Provides: libuutil3-devel = %{version}-%{release}
Obsoletes: zfs-devel <= %{version} Obsoletes: zfs-devel <= %{version}
@ -256,7 +258,7 @@ Obsoletes: libzfs2-devel <= %{version}
Obsoletes: libzfs4-devel <= %{version} Obsoletes: libzfs4-devel <= %{version}
Obsoletes: libzfs5-devel <= %{version} Obsoletes: libzfs5-devel <= %{version}
%description -n libzfs6-devel %description -n libzfs7-devel
This package contains the header files needed for building additional This package contains the header files needed for building additional
applications against the ZFS libraries. applications against the ZFS libraries.
@ -305,7 +307,7 @@ Summary: Python %{python_version} wrapper for libzfs_core
Group: Development/Languages/Python Group: Development/Languages/Python
License: Apache-2.0 License: Apache-2.0
BuildArch: noarch BuildArch: noarch
Requires: libzfs6 = %{version}-%{release} Requires: libzfs7 = %{version}-%{release}
Requires: libnvpair3 = %{version}-%{release} Requires: libnvpair3 = %{version}-%{release}
Requires: libffi Requires: libffi
Requires: python%{__python_pkg_version} Requires: python%{__python_pkg_version}
@ -433,7 +435,7 @@ make install DESTDIR=%{?buildroot}
find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \; find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
%if 0%{!?__brp_mangle_shebangs:1} %if 0%{!?__brp_mangle_shebangs:1}
find %{?buildroot}%{_bindir} \ find %{?buildroot}%{_bindir} \
\( -name arc_summary -or -name arcstat -or -name dbufstat \ \( -name zarcsummary -or -name zarcstat -or -name dbufstat \
-or -name zilstat \) \ -or -name zilstat \) \
-exec %{__sed} -i 's|^#!.*|#!%{__python}|' {} \; -exec %{__sed} -i 's|^#!.*|#!%{__python}|' {} \;
find %{?buildroot}%{_datadir} \ find %{?buildroot}%{_datadir} \
@ -508,8 +510,8 @@ systemctl --system daemon-reload >/dev/null || true
%{_bindir}/raidz_test %{_bindir}/raidz_test
%{_bindir}/zvol_wait %{_bindir}/zvol_wait
# Optional Python 3 scripts # Optional Python 3 scripts
%{_bindir}/arc_summary %{_bindir}/zarcsummary
%{_bindir}/arcstat %{_bindir}/zarcstat
%{_bindir}/dbufstat %{_bindir}/dbufstat
%{_bindir}/zilstat %{_bindir}/zilstat
# Man pages # Man pages
@ -548,7 +550,7 @@ systemctl --system daemon-reload >/dev/null || true
%config(noreplace) %{_bashcompletiondir}/zfs %config(noreplace) %{_bashcompletiondir}/zfs
%config(noreplace) %{_bashcompletiondir}/zpool %config(noreplace) %{_bashcompletiondir}/zpool
%files -n libzpool6 %files -n libzpool7
%{_libdir}/libzpool.so.* %{_libdir}/libzpool.so.*
%files -n libnvpair3 %files -n libnvpair3
@ -557,10 +559,10 @@ systemctl --system daemon-reload >/dev/null || true
%files -n libuutil3 %files -n libuutil3
%{_libdir}/libuutil.so.* %{_libdir}/libuutil.so.*
%files -n libzfs6 %files -n libzfs7
%{_libdir}/libzfs*.so.* %{_libdir}/libzfs*.so.*
%files -n libzfs6-devel %files -n libzfs7-devel
%{_pkgconfigdir}/libzfs.pc %{_pkgconfigdir}/libzfs.pc
%{_pkgconfigdir}/libzfsbootenv.pc %{_pkgconfigdir}/libzfsbootenv.pc
%{_pkgconfigdir}/libzfs_core.pc %{_pkgconfigdir}/libzfs_core.pc

3
fedora-43/SOURCES/zfs-2.4.0.tar.gz
View File

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

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

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

52
fedora-43/SPECS/zfs.spec
View File

@ -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))") print(sitedir);" 2>/dev/null || %{__python} -Esc "from distutils import sysconfig; print(sysconfig.get_python_lib(0,0))")
Name: zfs Name: zfs
Version: 2.3.5 Version: 2.4.0
Release: 1%{?dist} Release: 1%{?dist}
Summary: Commands to control the kernel modules and libraries Summary: Commands to control the kernel modules and libraries
@ -111,10 +111,10 @@ License: CDDL
URL: https://github.com/openzfs/zfs URL: https://github.com/openzfs/zfs
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libzpool6%{?_isa} = %{version}-%{release} Requires: libzpool7%{?_isa} = %{version}-%{release}
Requires: libnvpair3%{?_isa} = %{version}-%{release} Requires: libnvpair3%{?_isa} = %{version}-%{release}
Requires: libuutil3%{?_isa} = %{version}-%{release} Requires: libuutil3%{?_isa} = %{version}-%{release}
Requires: libzfs6%{?_isa} = %{version}-%{release} Requires: libzfs7%{?_isa} = %{version}-%{release}
Requires: %{name}-kmod = %{version} Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}-%{release} Provides: %{name}-kmod-common = %{version}-%{release}
Obsoletes: spl <= %{version} Obsoletes: spl <= %{version}
@ -162,22 +162,23 @@ Requires: sysstat
%description %description
This package contains the core ZFS command line utilities. This package contains the core ZFS command line utilities.
%package -n libzpool6 %package -n libzpool7
Summary: Native ZFS pool library for Linux Summary: Native ZFS pool library for Linux
Group: System Environment/Kernel Group: System Environment/Kernel
Obsoletes: libzpool2 <= %{version} Obsoletes: libzpool2 <= %{version}
Obsoletes: libzpool4 <= %{version} Obsoletes: libzpool4 <= %{version}
Obsoletes: libzpool5 <= %{version} Obsoletes: libzpool5 <= %{version}
Obsoletes: libzpool6 <= %{version}
%description -n libzpool6 %description -n libzpool7
This package contains the zpool library, which provides support This package contains the zpool library, which provides support
for managing zpools for managing zpools
%if %{defined ldconfig_scriptlets} %if %{defined ldconfig_scriptlets}
%ldconfig_scriptlets -n libzpool6 %ldconfig_scriptlets -n libzpool7
%else %else
%post -n libzpool6 -p /sbin/ldconfig %post -n libzpool7 -p /sbin/ldconfig
%postun -n libzpool6 -p /sbin/ldconfig %postun -n libzpool7 -p /sbin/ldconfig
%endif %endif
%package -n libnvpair3 %package -n libnvpair3
@ -224,31 +225,32 @@ This library provides a variety of compatibility functions for OpenZFS:
# The library version is encoded in the package name. When updating the # The library version is encoded in the package name. When updating the
# version information it is important to add an obsoletes line below for # version information it is important to add an obsoletes line below for
# the previous version of the package. # the previous version of the package.
%package -n libzfs6 %package -n libzfs7
Summary: Native ZFS filesystem library for Linux Summary: Native ZFS filesystem library for Linux
Group: System Environment/Kernel Group: System Environment/Kernel
Obsoletes: libzfs2 <= %{version} Obsoletes: libzfs2 <= %{version}
Obsoletes: libzfs4 <= %{version} Obsoletes: libzfs4 <= %{version}
Obsoletes: libzfs5 <= %{version} Obsoletes: libzfs5 <= %{version}
Obsoletes: libzfs6 <= %{version}
%description -n libzfs6 %description -n libzfs7
This package provides support for managing ZFS filesystems This package provides support for managing ZFS filesystems
%if %{defined ldconfig_scriptlets} %if %{defined ldconfig_scriptlets}
%ldconfig_scriptlets -n libzfs6 %ldconfig_scriptlets -n libzfs7
%else %else
%post -n libzfs6 -p /sbin/ldconfig %post -n libzfs7 -p /sbin/ldconfig
%postun -n libzfs6 -p /sbin/ldconfig %postun -n libzfs7 -p /sbin/ldconfig
%endif %endif
%package -n libzfs6-devel %package -n libzfs7-devel
Summary: Development headers Summary: Development headers
Group: System Environment/Kernel Group: System Environment/Kernel
Requires: libzfs6%{?_isa} = %{version}-%{release} Requires: libzfs7%{?_isa} = %{version}-%{release}
Requires: libzpool6%{?_isa} = %{version}-%{release} Requires: libzpool7%{?_isa} = %{version}-%{release}
Requires: libnvpair3%{?_isa} = %{version}-%{release} Requires: libnvpair3%{?_isa} = %{version}-%{release}
Requires: libuutil3%{?_isa} = %{version}-%{release} Requires: libuutil3%{?_isa} = %{version}-%{release}
Provides: libzpool6-devel = %{version}-%{release} Provides: libzpool7-devel = %{version}-%{release}
Provides: libnvpair3-devel = %{version}-%{release} Provides: libnvpair3-devel = %{version}-%{release}
Provides: libuutil3-devel = %{version}-%{release} Provides: libuutil3-devel = %{version}-%{release}
Obsoletes: zfs-devel <= %{version} Obsoletes: zfs-devel <= %{version}
@ -256,7 +258,7 @@ Obsoletes: libzfs2-devel <= %{version}
Obsoletes: libzfs4-devel <= %{version} Obsoletes: libzfs4-devel <= %{version}
Obsoletes: libzfs5-devel <= %{version} Obsoletes: libzfs5-devel <= %{version}
%description -n libzfs6-devel %description -n libzfs7-devel
This package contains the header files needed for building additional This package contains the header files needed for building additional
applications against the ZFS libraries. applications against the ZFS libraries.
@ -305,7 +307,7 @@ Summary: Python %{python_version} wrapper for libzfs_core
Group: Development/Languages/Python Group: Development/Languages/Python
License: Apache-2.0 License: Apache-2.0
BuildArch: noarch BuildArch: noarch
Requires: libzfs6 = %{version}-%{release} Requires: libzfs7 = %{version}-%{release}
Requires: libnvpair3 = %{version}-%{release} Requires: libnvpair3 = %{version}-%{release}
Requires: libffi Requires: libffi
Requires: python%{__python_pkg_version} Requires: python%{__python_pkg_version}
@ -433,7 +435,7 @@ make install DESTDIR=%{?buildroot}
find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \; find %{?buildroot}%{_libdir} -name '*.la' -exec rm -f {} \;
%if 0%{!?__brp_mangle_shebangs:1} %if 0%{!?__brp_mangle_shebangs:1}
find %{?buildroot}%{_bindir} \ find %{?buildroot}%{_bindir} \
\( -name arc_summary -or -name arcstat -or -name dbufstat \ \( -name zarcsummary -or -name zarcstat -or -name dbufstat \
-or -name zilstat \) \ -or -name zilstat \) \
-exec %{__sed} -i 's|^#!.*|#!%{__python}|' {} \; -exec %{__sed} -i 's|^#!.*|#!%{__python}|' {} \;
find %{?buildroot}%{_datadir} \ find %{?buildroot}%{_datadir} \
@ -508,8 +510,8 @@ systemctl --system daemon-reload >/dev/null || true
%{_bindir}/raidz_test %{_bindir}/raidz_test
%{_bindir}/zvol_wait %{_bindir}/zvol_wait
# Optional Python 3 scripts # Optional Python 3 scripts
%{_bindir}/arc_summary %{_bindir}/zarcsummary
%{_bindir}/arcstat %{_bindir}/zarcstat
%{_bindir}/dbufstat %{_bindir}/dbufstat
%{_bindir}/zilstat %{_bindir}/zilstat
# Man pages # Man pages
@ -548,7 +550,7 @@ systemctl --system daemon-reload >/dev/null || true
%config(noreplace) %{_bashcompletiondir}/zfs %config(noreplace) %{_bashcompletiondir}/zfs
%config(noreplace) %{_bashcompletiondir}/zpool %config(noreplace) %{_bashcompletiondir}/zpool
%files -n libzpool6 %files -n libzpool7
%{_libdir}/libzpool.so.* %{_libdir}/libzpool.so.*
%files -n libnvpair3 %files -n libnvpair3
@ -557,10 +559,10 @@ systemctl --system daemon-reload >/dev/null || true
%files -n libuutil3 %files -n libuutil3
%{_libdir}/libuutil.so.* %{_libdir}/libuutil.so.*
%files -n libzfs6 %files -n libzfs7
%{_libdir}/libzfs*.so.* %{_libdir}/libzfs*.so.*
%files -n libzfs6-devel %files -n libzfs7-devel
%{_pkgconfigdir}/libzfs.pc %{_pkgconfigdir}/libzfs.pc
%{_pkgconfigdir}/libzfsbootenv.pc %{_pkgconfigdir}/libzfsbootenv.pc
%{_pkgconfigdir}/libzfs_core.pc %{_pkgconfigdir}/libzfs_core.pc

Write Preview
Loading…
Cancel
Save