From 2c8941219bcd2ad14b184181e45902f2950cac45 Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Sun, 17 Dec 2017 01:11:33 +0100
Subject: [PATCH 1/2] Fix spl-dkms-git

---
 src/kernels/dkms.sh      | 6 +++---
 src/spl-dkms/PKGBUILD.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/kernels/dkms.sh b/src/kernels/dkms.sh
index aad4a4f..f0e4739 100644
--- a/src/kernels/dkms.sh
+++ b/src/kernels/dkms.sh
@@ -3,7 +3,7 @@ mode_name="dkms"
 mode_desc="Select and use the dkms packages"
 
 # version
-pkgrel="1"
+pkgrel="2"
 
 # Version for GIT packages
 pkgrel_git="${pkgrel}"
@@ -73,8 +73,8 @@ update_dkms_git_pkgbuilds() {
     fi
     spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
     zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
-    spl_mod_ver=${spl_git_ver%%_*}
-    zfs_mod_ver=${zfs_git_ver%%_*}
+    spl_mod_ver="git"
+    zfs_mod_ver="git"
     spl_src_target="git+${spl_git_url}#commit=${latest_spl_git_commit}"
     zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
 }
diff --git a/src/spl-dkms/PKGBUILD.sh b/src/spl-dkms/PKGBUILD.sh
index 6bb1d0a..bb9922c 100755
--- a/src/spl-dkms/PKGBUILD.sh
+++ b/src/spl-dkms/PKGBUILD.sh
@@ -35,7 +35,7 @@ package() {
     make clean
     make distclean
     find . -name ".git*" -print0 | xargs -0 rm -fr --
-    scripts/dkms.mkconf -v ${zfs_mod_ver} -f dkms.conf -n spl
+    scripts/dkms.mkconf -v ${spl_mod_ver} -f dkms.conf -n spl
     chmod g-w,o-w -R .
 }
 

From d03371a921d0e1f4af9232f0a716e1ed64c2421e Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Sun, 17 Dec 2017 02:59:54 +0100
Subject: [PATCH 2/2] dkms: Remove unnecessary buildsteps

---
 src/spl-dkms/PKGBUILD.sh | 5 -----
 src/zfs-dkms/PKGBUILD.sh | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/src/spl-dkms/PKGBUILD.sh b/src/spl-dkms/PKGBUILD.sh
index bb9922c..e178cb4 100755
--- a/src/spl-dkms/PKGBUILD.sh
+++ b/src/spl-dkms/PKGBUILD.sh
@@ -21,9 +21,6 @@ ${spl_replaces}
 build() {
     cd "${spl_workdir}"
     ./autogen.sh
-    ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/bin \\
-                --with-config=user
-    make
 }
 
 package() {
@@ -32,8 +29,6 @@ package() {
     cp -a ${spl_workdir}/. \${dkmsdir}
 
     cd "\${dkmsdir}"
-    make clean
-    make distclean
     find . -name ".git*" -print0 | xargs -0 rm -fr --
     scripts/dkms.mkconf -v ${spl_mod_ver} -f dkms.conf -n spl
     chmod g-w,o-w -R .
diff --git a/src/zfs-dkms/PKGBUILD.sh b/src/zfs-dkms/PKGBUILD.sh
index c07af6a..4f3517e 100755
--- a/src/zfs-dkms/PKGBUILD.sh
+++ b/src/zfs-dkms/PKGBUILD.sh
@@ -22,10 +22,6 @@ ${zfs_replaces}
 build() {
     cd "${zfs_workdir}"
     ./autogen.sh
-    ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \\
-                --datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \\
-                --libexecdir=/usr/lib/zfs-${zol_version} --with-config=user
-    make
 }
 
 package() {
@@ -34,8 +30,6 @@ package() {
     cp -a ${zfs_workdir}/. \${dkmsdir}
 
     cd "\${dkmsdir}"
-    make clean
-    make distclean
     find . -name ".git*" -print0 | xargs -0 rm -fr --
     scripts/dkms.mkconf -v ${zfs_mod_ver} -f dkms.conf -n zfs
     chmod g-w,o-w -R .