Merge pull request #211 from minextu/fix-spl-dkms-git

Fix spl-dkms-git

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}"
 }

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,10 +29,8 @@ package() {
     cp -a ${spl_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 spl
+    scripts/dkms.mkconf -v ${spl_mod_ver} -f dkms.conf -n spl
     chmod g-w,o-w -R .
 }
 

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 .