From 756c20d76df9d8dc8e7f034afb8c3d691d0127d3 Mon Sep 17 00:00:00 2001
From: Jaron Kent-Dobias <jaron@kent-dobias.com>
Date: Fri, 1 Dec 2023 20:14:04 +0100
Subject: Upgraded to zfs 2.2.2

---
 PKGBUILD | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/PKGBUILD b/PKGBUILD
index 9ae0372..5c00f3c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=linux-kentdobias
 _kver=6.6.3
-_zver=2.2.1
+_zver=2.2.2
 pkgver="${_kver}_${_zver}"
 pkgrel=1
 pkgdesc='Linux'
@@ -26,7 +26,6 @@ makedepends=(
   python-sphinx
   texlive-latexextra
 
-  git
   clang
   llvm
   lld
@@ -50,12 +49,12 @@ validpgpkeys=(
 # https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
 sha256sums=('28edfc3d4f90cd738f2a20f5a2d68510268176d6111f6278d8f495edfd9495a7'
             'SKIP'
-            '4ff2de43d39710283ae8ff1744aa96e6cdc83c8efe86a715294d4f6bc34a8e8e'
+            '76bc0547d9ba31d4b0142e417aaaf9f969072c3cb3c1a5b10c8738f39ed12fc9'
             'SKIP'
             'e5e0be09f55300de5786a3bc684bc7fb74828475266b120cb7655dd431d9881c')
 b2sums=('cd0d70316592fface23a6eddb9d0f8b0c67593f5466388043ebd68613be4eabc3e7c712ce758fa63dd11603101d9d91e22b3552b436bbd1c76f8e19208d7bf22'
         'SKIP'
-        'c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6'
+        'f0619ae42d898d18077096217d0a9ddd7c7378424707aa51d3645661b2889a1459bc4a5e9fe42b6860b2d26e4600da35765b0e741725dafacc2ead2370cad866'
         'SKIP'
         '8a6943e82b71bf4cce97a00ebbbbfb7ab26a8e462a44fd219db4614ba307bfbad462100ad508c1802fa9bb47f4282f91d7befee8659bed6cb0463c9bd9cff5c6')
 
@@ -76,7 +75,7 @@ prepare() {
     src="${src%%::*}"
     src="${src##*/}"
     src="${src%.zst}"
-    [[ $src = *.patch ]] || continue
+    [[ $src = *.patch && ! $src = zfs* ]] || continue
     echo "Applying patch $src..."
     patch -Np1 < "../$src"
   done
@@ -88,19 +87,14 @@ prepare() {
 
   cd ../zfs-${_zver}
 
-  echo "diff --git a/config/kernel-inode-times.m4 b/config/kernel-inode-times.m4
-index 412e13b47..aae95abf1 100644
---- a/config/kernel-inode-times.m4
-+++ b/config/kernel-inode-times.m4
-@@ -47,7 +47,7 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [
- 		#include <linux/fs.h>
- 	],[
- 		struct inode ip;
--		struct timespec64 ts;
-+		struct timespec64 ts = {0};
- 
- 		memset(&ip, 0, sizeof(ip));
- 		inode_set_ctime_to_ts(&ip, ts);" | patch -Np1
+  for src in "${source[@]}"; do
+    src="${src%%::*}"
+    src="${src##*/}"
+    src="${src%.zst}"
+    [[ $src = *.patch && $src = zfs* ]] || continue
+    echo "Applying patch $src..."
+    patch -Np1 < "../$src"
+  done
 
   ./autogen.sh
   KERNEL_LLVM=1 CC=clang ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --with-mounthelperdir=/usr/bin \
-- 
cgit v1.2.3-70-g09d2