summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD8
2 files changed, 11 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 79eb9fb0ee26..54f3dab5366a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
pkgver = 2.1.9
- pkgrel = 1
+ pkgrel = 2
url = https://zfsonlinux.org/
arch = any
license = CDDL
@@ -13,14 +13,17 @@ pkgbase = zfs-dkms
replaces = spl-dkms
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz.asc
+ source = https://github.com/openzfs/zfs/commit/59f187563937aa0d6c74a9854eb1cab6632866f9.patch
source = 0001-only-build-the-module-in-dkms.conf.patch
validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
sha256sums = 6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6
sha256sums = SKIP
+ sha256sums = 659a214380e77b5eb4f629c02eeaaf7cb4b0f9ffe316d17bb19ae370b54bc912
sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5
b2sums = d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812
b2sums = SKIP
+ b2sums = 95424713f291a5974686b9dbf02ef5bfb3ef59b01a6a05b00c7c033c015a23ec6ad256e2b140b68e839058dad76496996caaf2018d11a1846dc906cd988258f5
b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791
pkgname = zfs-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 791687b4e67d..35bfd8f0c027 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=zfs-dkms
pkgver=2.1.9
-pkgrel=1
+pkgrel=2
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
url="https://zfsonlinux.org/"
@@ -15,12 +15,15 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms')
provides+=('zfs')
replaces=('spl-dkms')
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
+ "https://github.com/openzfs/zfs/commit/59f187563937aa0d6c74a9854eb1cab6632866f9.patch"
"0001-only-build-the-module-in-dkms.conf.patch")
sha256sums=('6b172cdf2eb54e17fcd68f900fab33c1430c5c59848fa46fab83614922fe50f6'
'SKIP'
+ '659a214380e77b5eb4f629c02eeaaf7cb4b0f9ffe316d17bb19ae370b54bc912'
'8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5')
b2sums=('d7553cc162687531b254089e29e2e15e2eb6b362cecd8e70c24bbb5dbffbde82036ad2d416f4caeceaa324bee8a2e59d9e3cd8a3bf55a2e3c0718c7af9562812'
'SKIP'
+ '95424713f291a5974686b9dbf02ef5bfb3ef59b01a6a05b00c7c033c015a23ec6ad256e2b140b68e839058dad76496996caaf2018d11a1846dc906cd988258f5'
'58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -30,6 +33,9 @@ prepare() {
patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
+ # Backport fix for build issues on linux-6.2.8 kernel. (https://github.com/openzfs/zfs/issues/14658)
+ patch -p1 -i ../59f187563937aa0d6c74a9854eb1cab6632866f9.patch
+
# remove unneeded sections from module build
sed -ri "/AC_CONFIG_FILES/,/]\)/{
/AC_CONFIG_FILES/n