summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2019-01-02 09:30:04 -0500
committerEli Schwartz <eschwartz@archlinux.org>2019-01-02 09:30:04 -0500
commit8fc22559ae554988a755741881f339bff3b9b191 (patch)
tree89bedb75835bfd3020100041fc00572dc5fff2d5
parentupgpkg: zfs-dkms 0.7.12-1 (diff)
downloadzfs-dkms-8fc22559ae554988a755741881f339bff3b9b191.tar.xz
upgpkg: zfs-dkms 0.7.12-2
fix build for linux 4.20
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD7
2 files changed, 9 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4567f51..657a7b1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
pkgbase = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
pkgver = 0.7.12
- pkgrel = 1
+ pkgrel = 2
url = https://zfsonlinux.org/
arch = any
license = CDDL
makedepends = git
provides = zfs
source = git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.7.12?signed
+ source = https://github.com/zfsonlinux/zfs/pull/8227/commits/4f981f6ab614a908f912f7dc147b248f96b498a2.patch
source = 0001-only-build-the-module-in-dkms.conf.patch
validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
sha256sums = SKIP
+ sha256sums = 4ec0d1cd40295dc73c6f595c5e17283caa417ecd6a81fef526e31670034824a6
sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409
pkgname = zfs-dkms
diff --git a/PKGBUILD b/PKGBUILD
index ff10893..4771041 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=zfs-dkms
pkgver=0.7.12
-pkgrel=1
+pkgrel=2
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
url="https://zfsonlinux.org/"
@@ -11,8 +11,10 @@ license=('CDDL')
makedepends=('git')
provides=("${pkgname%-dkms}")
source=("git+https://github.com/zfsonlinux/zfs.git#tag=zfs-${pkgver}?signed"
+ "https://github.com/zfsonlinux/zfs/pull/8227/commits/4f981f6ab614a908f912f7dc147b248f96b498a2.patch"
"0001-only-build-the-module-in-dkms.conf.patch")
sha256sums=('SKIP'
+ '4ec0d1cd40295dc73c6f595c5e17283caa417ecd6a81fef526e31670034824a6'
'780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -20,6 +22,9 @@ validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key
prepare() {
cd "${srcdir}"/${pkgname%-dkms}
+ # fix for linux 4.20 https://github.com/zfsonlinux/zfs/pull/8227
+ patch -p1 -i ../4f981f6ab614a908f912f7dc147b248f96b498a2.patch
+
patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
# remove unneeded sections from module build