[packages/zfs] - rel 2, build for kernel 6.14
baggins
baggins at pld-linux.org
Sat Apr 19 02:47:53 CEST 2025
commit b58ef2f4d8f465dab530cf600508ea52b1c953d6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Apr 19 02:57:48 2025 +0200
- rel 2, build for kernel 6.14
kernel-6.14.patch | 27 +++++++++++++++++++++++++++
zfs.spec | 4 +++-
2 files changed, 30 insertions(+), 1 deletion(-)
---
diff --git a/zfs.spec b/zfs.spec
index fbd2cbc..3968bde 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -24,7 +24,7 @@ exit 1
%define _duplicate_files_terminate_build 0
-%define rel 1
+%define rel 2
%define pname zfs
Summary: Native Linux port of the ZFS filesystem
Summary(pl.UTF-8): Natywny linuksowy port systemu plików ZFS
@@ -37,6 +37,7 @@ Source0: https://github.com/openzfs/zfs/releases/download/zfs-%{version}/%{pname
# Source0-md5: 1d8fef7fce8556cd1d4eb0a6dafcbaa8
Patch0: initdir.patch
Patch1: pld.patch
+Patch2: kernel-6.14.patch
URL: https://zfsonlinux.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -264,6 +265,7 @@ 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
new file mode 100644
index 0000000..e17a624
--- /dev/null
+++ b/kernel-6.14.patch
@@ -0,0 +1,27 @@
+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/b58ef2f4d8f465dab530cf600508ea52b1c953d6
More information about the pld-cvs-commit
mailing list