Apply patch to warn on unsupported kernel version

2 files changed, 11 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73d6eccfc528..2c85f58dc1c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zfs-dkms
 	pkgdesc = Kernel modules for the Zettabyte File System.
 	pkgver = 2.2.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://zfsonlinux.org/
 	arch = any
 	license = CDDL
@@ -10,14 +10,17 @@ pkgbase = zfs-dkms
 	provides = zfs
 	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.3/zfs-2.2.3.tar.gz
 	source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.3/zfs-2.2.3.tar.gz.asc
+	source = https://github.com/openzfs/zfs/commit/2b481b5477d3a95d0eab723c6639f7114e146ae1.patch
 	source = 0001-only-build-the-module-in-dkms.conf.patch
 	validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
 	validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
 	sha256sums = 30a512f34ec5c841b8b2b32cc9c1a03fd49391b26c9164d3fb30573fb5d81ac3
 	sha256sums = SKIP
+	sha256sums = b3444bbb71b508e12dcbce1a61d01275960f6c38b8db9c163aced83e4cd092c8
 	sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5
 	b2sums = f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b
 	b2sums = SKIP
+	b2sums = 245f489ba2f916e95fbbc9616ac7d9f6149dd3b6c63580b25c0af69aa2ad96d2ed28bf4e1446cbf7c8299f5c14de4712c931d3f4949bb8149d5a966310ca6977
 	b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791
 
 pkgname = zfs-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 62f3843d3eb7..ac06a5d01772 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=zfs-dkms
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Kernel modules for the Zettabyte File System."
 arch=('any')
 url="https://zfsonlinux.org/"
@@ -13,12 +13,15 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}")
 # ambiguous, provided for backwards compat, pls don't use
 provides+=('zfs')
 source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
+        "https://github.com/openzfs/zfs/commit/2b481b5477d3a95d0eab723c6639f7114e146ae1.patch"
         "0001-only-build-the-module-in-dkms.conf.patch")
 sha256sums=('30a512f34ec5c841b8b2b32cc9c1a03fd49391b26c9164d3fb30573fb5d81ac3'
             'SKIP'
+            'b3444bbb71b508e12dcbce1a61d01275960f6c38b8db9c163aced83e4cd092c8'
             '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5')
 b2sums=('f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b'
         'SKIP'
+        '245f489ba2f916e95fbbc9616ac7d9f6149dd3b6c63580b25c0af69aa2ad96d2ed28bf4e1446cbf7c8299f5c14de4712c931d3f4949bb8149d5a966310ca6977'
         '58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791')
 validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027'  # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
               'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -28,6 +31,9 @@ prepare() {
 
     patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
 
+    # Apply patch to warn on unsupported kernel version. (https://github.com/openzfs/zfs/pull/15986)
+    patch -p1 -i ../2b481b5477d3a95d0eab723c6639f7114e146ae1.patch
+
     # remove unneeded sections from module build
     sed -ri "/AC_CONFIG_FILES/,/]\)/{
 /AC_CONFIG_FILES/n