summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2022-07-13 10:19:20 +0300
committerAqua-sama <aqua@iserlohn-fortress.net>2022-07-13 10:19:20 +0300
commit29cf94608906e079368eba9be2cc96acff73aed2 (patch)
tree05e3916175cceb33119c5a4b814734ec47ba9c51
parentUpdate to 2.1.4 (diff)
parentUpstream 2.1.5 (diff)
downloadzfs-dkms-29cf94608906e079368eba9be2cc96acff73aed2.tar.xz
Merge branch 'master' of https://aur.archlinux.org/zfs-dkms
-rw-r--r--0001-only-build-the-module-in-dkms.conf.patch4
-rw-r--r--PKGBUILD7
2 files changed, 6 insertions, 5 deletions
diff --git a/0001-only-build-the-module-in-dkms.conf.patch b/0001-only-build-the-module-in-dkms.conf.patch
index c254dc1..f2c5d5f 100644
--- a/0001-only-build-the-module-in-dkms.conf.patch
+++ b/0001-only-build-the-module-in-dkms.conf.patch
@@ -27,10 +27,10 @@ index 88c289383..5a859a0e0 100755
--with-linux-obj="\${kernel_source_dir}"
\$(
[[ -n \"\${ICP_ROOT}\" ]] && \\
-@@ -69,7 +54,7 @@ POST_BUILD="scripts/dkms.postbuild
+@@ -68,7 +53,7 @@ POST_BUILD="scripts/dkms.postbuild
+ -t \${dkms_tree}
"
AUTOINSTALL="yes"
- REMAKE_INITRD="no"
-MAKE[0]="make"
+MAKE[0]="make -C module/"
STRIP[0]="\$(
diff --git a/PKGBUILD b/PKGBUILD
index d1dc47f..a712223 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
pkgname=zfs-dkms
-pkgver=2.1.4
+pkgver=2.1.5
pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
@@ -15,9 +15,9 @@ provides+=('zfs')
replaces=('spl-dkms')
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
"0001-only-build-the-module-in-dkms.conf.patch")
-b2sums=('be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200'
+b2sums=('c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49'
'SKIP'
- '0e91cd2421b81c8ee517503059fb9ebc20e7c150801851cff2ffdfb64cbcd9a4e0657e7678c412a334fc37b589006ec78dca2ccc091b034a83a00966acba6f5b')
+ '58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -40,6 +40,7 @@ build() {
cd "${srcdir}"/${pkgname%-dkms}-${pkgver}
./scripts/dkms.mkconf -n ${pkgname%-dkms} -v ${pkgver} -f dkms.conf
+ ./scripts/make_gitrev.sh include/zfs_gitrev.h
}
package() {