[packages/zfs] up to 2.3.2
atler
atler at pld-linux.org
Sun May 4 23:47:59 CEST 2025
commit 241fd34407d3001d723c94f65cd75e122ed31d53
Author: Jan Palus <atler at pld-linux.org>
Date: Sun May 4 23:46:47 2025 +0200
up to 2.3.2
kernel-6.14.patch | 27 ---------------------------
zfs.spec | 8 +++-----
2 files changed, 3 insertions(+), 32 deletions(-)
---
diff --git a/zfs.spec b/zfs.spec
index 3968bde..0962827 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -24,20 +24,19 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define rel 2
+%define rel 1
%define pname zfs
Summary: Native Linux port of the ZFS filesystem
Summary(pl.UTF-8): Natywny linuksowy port systemu plików ZFS
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 2.3.1
+Version: 2.3.2
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: CDDL
Group: Applications/System
Source0: https://github.com/openzfs/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz
-# Source0-md5: 1d8fef7fce8556cd1d4eb0a6dafcbaa8
+# Source0-md5: eef957a390e9c7641cd829827b0ce183
Patch0: initdir.patch
Patch1: pld.patch
-Patch2: kernel-6.14.patch
URL: https://zfsonlinux.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -265,7 +264,6 @@ p=`pwd`\
%setup -q -n %{pname}-%{version}
%patch -P 0 -p1
%patch -P 1 -p1
-%patch -P 2 -p1
%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
cmd/arc_summary
diff --git a/kernel-6.14.patch b/kernel-6.14.patch
deleted file mode 100644
index e17a624..0000000
--- a/kernel-6.14.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 9611dfdc70882ecdce14816d020f55dba05fbb69 Mon Sep 17 00:00:00 2001
-From: Tony Hutter <hutter2 at llnl.gov>
-Date: Tue, 25 Mar 2025 10:35:01 -0700
-Subject: [PATCH] Linux 6.14 compat: META (#17098) (#17172)
-
-Update the META file to reflect compatibility with the 6.14
-kernel.
-
-Signed-off-by: Tony Hutter <hutter2 at llnl.gov>
-Reviewed-by: Rob Norris <robn at despairlabs.com>
-Reviewed-by: Brian Behlendorf <behlendorf1 at llnl.gov>
-Reviewed-by: @ImAwsumm
----
- META | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/META b/META
-index 161bec0ce8a7..6249d5ec2458 100644
---- a/META
-+++ b/META
-@@ -6,5 +6,5 @@ Release: 1
- Release-Tags: relext
- License: CDDL
- Author: OpenZFS
--Linux-Maximum: 6.13
-+Linux-Maximum: 6.14
- Linux-Minimum: 4.18
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/241fd34407d3001d723c94f65cd75e122ed31d53
More information about the pld-cvs-commit
mailing list