From e8858bdae02e5f5aac503e0796e13affe4e3bd8d Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Mon, 4 Dec 2017 13:27:24 +0100
Subject: [PATCH 1/3] Fix dependency for a fixed common-utils version (git
 packages)

---
 src/kernels/dkms.sh           | 4 ++--
 src/kernels/linux-hardened.sh | 4 ++--
 src/kernels/linux-lts.sh      | 4 ++--
 src/kernels/linux-zen.sh      | 4 ++--
 src/kernels/linux.sh          | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/kernels/dkms.sh b/src/kernels/dkms.sh
index 9552c57..d562575 100644
--- a/src/kernels/dkms.sh
+++ b/src/kernels/dkms.sh
@@ -77,8 +77,8 @@ update_dkms_git_pkgbuilds() {
         git_check_repo
         git_calc_pkgver
     fi
-    spl_utils_pkgname="spl-utils-common-git>=${spl_git_ver}"
-    zfs_utils_pkgname="zfs-utils-common-git>=${zfs_git_ver}"
+    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%%_*}
 }
diff --git a/src/kernels/linux-hardened.sh b/src/kernels/linux-hardened.sh
index d50400a..62753c9 100644
--- a/src/kernels/linux-hardened.sh
+++ b/src/kernels/linux-hardened.sh
@@ -99,6 +99,6 @@ update_linux_hardened_git_pkgbuilds() {
         git_check_repo
         git_calc_pkgver
     fi
-    spl_utils_pkgname="spl-utils-common-git>=${spl_git_ver}"
-    zfs_utils_pkgname="zfs-utils-common-git>=${zfs_git_ver}"
+    spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
+    zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
 }
diff --git a/src/kernels/linux-lts.sh b/src/kernels/linux-lts.sh
index 1ed1791..001178d 100644
--- a/src/kernels/linux-lts.sh
+++ b/src/kernels/linux-lts.sh
@@ -101,6 +101,6 @@ update_linux_lts_git_pkgbuilds() {
         git_check_repo
         git_calc_pkgver
     fi
-    spl_utils_pkgname="spl-utils-common-git>=${spl_git_ver}"
-    zfs_utils_pkgname="zfs-utils-common-git>=${zfs_git_ver}"
+    spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
+    zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
 }
diff --git a/src/kernels/linux-zen.sh b/src/kernels/linux-zen.sh
index ab5cbac..1ff9120 100644
--- a/src/kernels/linux-zen.sh
+++ b/src/kernels/linux-zen.sh
@@ -99,6 +99,6 @@ update_linux_git_pkgbuilds() {
         git_check_repo
         git_calc_pkgver
     fi
-    spl_utils_pkgname="spl-utils-common-git>=${spl_git_ver}"
-    zfs_utils_pkgname="zfs-utils-common-git>=${zfs_git_ver}"
+    spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
+    zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
 }
diff --git a/src/kernels/linux.sh b/src/kernels/linux.sh
index b99bc7f..c914783 100644
--- a/src/kernels/linux.sh
+++ b/src/kernels/linux.sh
@@ -101,6 +101,6 @@ update_linux_git_pkgbuilds() {
         git_check_repo
         git_calc_pkgver
     fi
-    spl_utils_pkgname="spl-utils-common-git>=${spl_git_ver}"
-    zfs_utils_pkgname="zfs-utils-common-git>=${zfs_git_ver}"
+    spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
+    zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
 }

From de95ad4c443045080399367d7d5576d4cdf01aeb Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Sat, 9 Dec 2017 16:52:50 +0100
Subject: [PATCH 2/3] Remove pkgver() from git packages see
 https://github.com/archzfs/archzfs/pull/195 for the reason

---
 src/spl-dkms/PKGBUILD.sh  | 4 ----
 src/spl-utils/PKGBUILD.sh | 4 ----
 src/spl/PKGBUILD.sh       | 4 +---
 src/zfs-dkms/PKGBUILD.sh  | 4 ----
 src/zfs-utils/PKGBUILD.sh | 4 ----
 src/zfs/PKGBUILD.sh       | 4 ----
 6 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/src/spl-dkms/PKGBUILD.sh b/src/spl-dkms/PKGBUILD.sh
index b089b9e..6bb1d0a 100755
--- a/src/spl-dkms/PKGBUILD.sh
+++ b/src/spl-dkms/PKGBUILD.sh
@@ -41,8 +41,4 @@ package() {
 
 EOF
 
-if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() { \n    cd \"${spl_workdir}\" \n\    printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g' )\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\" \n}" ${spl_dkms_pkgbuild_path}/PKGBUILD
-fi
-
 pkgbuild_cleanup "${spl_dkms_pkgbuild_path}/PKGBUILD"
diff --git a/src/spl-utils/PKGBUILD.sh b/src/spl-utils/PKGBUILD.sh
index 115abbd..3db70b7 100755
--- a/src/spl-utils/PKGBUILD.sh
+++ b/src/spl-utils/PKGBUILD.sh
@@ -30,8 +30,4 @@ package() {
 }
 EOF
 
-if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() {\n    cd \"${spl_workdir}\"\n    printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g')\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\" \n}" ${spl_utils_pkgbuild_path}/PKGBUILD
-fi
-
 pkgbuild_cleanup "${spl_utils_pkgbuild_path}/PKGBUILD"
diff --git a/src/spl/PKGBUILD.sh b/src/spl/PKGBUILD.sh
index 275a558..3f18e1d 100755
--- a/src/spl/PKGBUILD.sh
+++ b/src/spl/PKGBUILD.sh
@@ -54,9 +54,7 @@ package_${spl_pkgname}-headers() {
 
 EOF
 
-if [[ ${archzfs_package_group} =~ -git$ ]]; then
-    sed -i "/^build()/i pkgver() {\n    cd \"${spl_workdir}\"\n    printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g' )\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\".${kernel_version_full_pkgver} \n}" ${spl_pkgbuild_path}/PKGBUILD
-else
+if [[ ! ${archzfs_package_group} =~ -git$ ]]; then
     sed -i "/^build()/i prepare() {\n    cd \"${spl_workdir}\"\n    patch -Np1 -i \${srcdir}/0001-Linux-4.14-compat-vfs_read-vfs_write.patch\n}" ${spl_pkgbuild_path}/PKGBUILD
 fi
 
diff --git a/src/zfs-dkms/PKGBUILD.sh b/src/zfs-dkms/PKGBUILD.sh
index 4fcaad8..c07af6a 100755
--- a/src/zfs-dkms/PKGBUILD.sh
+++ b/src/zfs-dkms/PKGBUILD.sh
@@ -44,8 +44,4 @@ package() {
 
 EOF
 
-if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() {\n    cd \"${zfs_workdir}\"\n    printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g')\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\" \n}" ${zfs_dkms_pkgbuild_path}/PKGBUILD
-fi
-
 pkgbuild_cleanup "${zfs_dkms_pkgbuild_path}/PKGBUILD"
diff --git a/src/zfs-utils/PKGBUILD.sh b/src/zfs-utils/PKGBUILD.sh
index e63a805..95a661d 100755
--- a/src/zfs-utils/PKGBUILD.sh
+++ b/src/zfs-utils/PKGBUILD.sh
@@ -58,8 +58,4 @@ package() {
 }
 EOF
 
-if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() {\n    cd \"${zfs_workdir}\"\n    printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g')\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\" \n}" ${zfs_utils_pkgbuild_path}/PKGBUILD
-fi
-
 pkgbuild_cleanup "${zfs_utils_pkgbuild_path}/PKGBUILD"
diff --git a/src/zfs/PKGBUILD.sh b/src/zfs/PKGBUILD.sh
index 12e022c..c531c7c 100755
--- a/src/zfs/PKGBUILD.sh
+++ b/src/zfs/PKGBUILD.sh
@@ -56,8 +56,4 @@ package_${zfs_pkgname}-headers() {
 
 EOF
 
-if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() {\n    cd \"${zfs_workdir}\"\n    printf \"%s.r%s.%s\" \"\$(git log -n 1 --pretty=format:'%cd' --date=short | sed 's/-/./g')\" \"\$(git rev-list --count HEAD)\" \"\$(git rev-parse --short HEAD)\".${kernel_version_full_pkgver} \n}" ${zfs_pkgbuild_path}/PKGBUILD
-fi
-
 pkgbuild_cleanup "${zfs_pkgbuild_path}/PKGBUILD"

From fbc5e19b18cad2cab6f26a4f6aab6ea8e98c7975 Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Sat, 9 Dec 2017 17:09:17 +0100
Subject: [PATCH 3/3] Lock git packages to commit

---
 lib.sh                        | 16 +++++++++++++---
 src/kernels/common-git.sh     |  8 ++------
 src/kernels/dkms.sh           |  8 ++------
 src/kernels/linux-hardened.sh |  8 ++------
 src/kernels/linux-lts.sh      |  8 ++------
 src/kernels/linux-zen.sh      |  8 ++------
 src/kernels/linux.sh          |  9 +++------
 7 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/lib.sh b/lib.sh
index 4fb4111..2674172 100644
--- a/lib.sh
+++ b/lib.sh
@@ -561,7 +561,7 @@ check_zol_version() {
 check_mode() {
     # $1 the mode to check for
     debug "check_mode: checking '$1'"
-    
+
     # add all available modes
     if [[ "${1}" == "all" ]]; then
         for m in "${mode_list[@]}"; do
@@ -767,7 +767,7 @@ check_skip_build() {
             return 0
         fi
     fi
-    
+
     return 1
 }
 
@@ -785,7 +785,7 @@ check_skip_src() {
         msg "sources for ${pkg} have already been built"
         return 0
     fi
-    
+
     return 1
 }
 
@@ -925,6 +925,16 @@ git_calc_pkgver() {
           debug "zfs_pkgver: ${zfs_pkgver}"
         fi
 
+        # get latest commit sha
+        cmd="cd temp/${repo} && "
+        cmd+="git rev-parse HEAD"
+        run_cmd_no_output_no_dry_run "${cmd}"
+        if [[ ${repo} =~ ^zfs ]]; then
+          latest_zfs_git_commit=${run_cmd_output}
+        else
+          latest_spl_git_commit=${run_cmd_output}
+        fi
+
         # Cleanup
         msg2 "Removing working directory"
         run_cmd_no_output_no_dry_run "rm -vrf temp"
diff --git a/src/kernels/common-git.sh b/src/kernels/common-git.sh
index 234c19e..11a8ff4 100644
--- a/src/kernels/common-git.sh
+++ b/src/kernels/common-git.sh
@@ -32,15 +32,9 @@ update_common_git_pkgbuilds() {
     spl_utils_pkgbuild_path="packages/${kernel_name}/${spl_utils_pkgname}"
     zfs_utils_pkgbuild_path="packages/${kernel_name}/${zfs_utils_pkgname}"
     spl_src_target="git+${spl_git_url}"
-    if [[ ${spl_git_commit} != "" ]]; then
-        spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
-    fi
     spl_src_hash="SKIP"
     spl_makedepends="\"git\""
     zfs_src_target="git+${zfs_git_url}"
-    if [[ ${zfs_git_commit} != "" ]]; then
-        zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
-    fi
     zfs_src_hash="SKIP"
     zfs_makedepends="\"git\""
     spl_workdir="\${srcdir}/spl"
@@ -53,4 +47,6 @@ update_common_git_pkgbuilds() {
         git_check_repo
         git_calc_pkgver
     fi
+    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/kernels/dkms.sh b/src/kernels/dkms.sh
index d562575..aad4a4f 100644
--- a/src/kernels/dkms.sh
+++ b/src/kernels/dkms.sh
@@ -59,15 +59,9 @@ update_dkms_git_pkgbuilds() {
     spl_dkms_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
     zfs_dkms_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
     spl_src_target="git+${spl_git_url}"
-    if [[ ${spl_git_commit} != "" ]]; then
-        spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
-    fi
     spl_src_hash="SKIP"
     spl_makedepends="\"git\""
     zfs_src_target="git+${zfs_git_url}"
-    if [[ ${zfs_git_commit} != "" ]]; then
-        zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
-    fi
     zfs_src_hash="SKIP"
     zfs_makedepends="\"git\""
     spl_workdir="\${srcdir}/spl"
@@ -81,4 +75,6 @@ update_dkms_git_pkgbuilds() {
     zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
     spl_mod_ver=${spl_git_ver%%_*}
     zfs_mod_ver=${zfs_git_ver%%_*}
+    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/kernels/linux-hardened.sh b/src/kernels/linux-hardened.sh
index 62753c9..9c679d1 100644
--- a/src/kernels/linux-hardened.sh
+++ b/src/kernels/linux-hardened.sh
@@ -80,17 +80,11 @@ update_linux_hardened_git_pkgbuilds() {
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
     zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
     spl_src_target="git+${spl_git_url}"
-    if [[ ${spl_git_commit} != "" ]]; then
-        spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
-    fi
     spl_src_hash="SKIP"
     linux_depends="\"linux-hardened=${kernel_version}\""
     linux_headers_depends="\"linux-hardened-headers=${kernel_version}\""
     spl_makedepends="\"git\""
     zfs_src_target="git+${zfs_git_url}"
-    if [[ ${zfs_git_commit} != "" ]]; then
-        zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
-    fi
     zfs_src_hash="SKIP"
     zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
     spl_workdir="\${srcdir}/spl"
@@ -101,4 +95,6 @@ update_linux_hardened_git_pkgbuilds() {
     fi
     spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
     zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
+    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/kernels/linux-lts.sh b/src/kernels/linux-lts.sh
index 001178d..b75a766 100644
--- a/src/kernels/linux-lts.sh
+++ b/src/kernels/linux-lts.sh
@@ -82,17 +82,11 @@ update_linux_lts_git_pkgbuilds() {
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
     zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
     spl_src_target="git+${spl_git_url}"
-    if [[ ${spl_git_commit} != "" ]]; then
-        spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
-    fi
     spl_src_hash="SKIP"
     linux_depends="\"linux-lts=${kernel_version_full}\""
     linux_headers_depends="\"linux-lts-headers=${kernel_version_full}\""
     spl_makedepends="\"libelf\" \"git\""
     zfs_src_target="git+${zfs_git_url}"
-    if [[ ${zfs_git_commit} != "" ]]; then
-        zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
-    fi
     zfs_src_hash="SKIP"
     zfs_makedepends="\"libelf\" \"git\" \"${spl_pkgname}-headers\""
     spl_workdir="\${srcdir}/spl"
@@ -103,4 +97,6 @@ update_linux_lts_git_pkgbuilds() {
     fi
     spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
     zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
+    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/kernels/linux-zen.sh b/src/kernels/linux-zen.sh
index 1ff9120..7b3701f 100644
--- a/src/kernels/linux-zen.sh
+++ b/src/kernels/linux-zen.sh
@@ -80,17 +80,11 @@ update_linux_git_pkgbuilds() {
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
     zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
     spl_src_target="git+${spl_git_url}"
-    if [[ ${spl_git_commit} != "" ]]; then
-        spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
-    fi
     spl_src_hash="SKIP"
     linux_depends="\"linux-zen=${kernel_version_full}\""
     linux_headers_depends="\"linux-zen-headers=${kernel_version_full}\""
     spl_makedepends="\"git\""
     zfs_src_target="git+${zfs_git_url}"
-    if [[ ${zfs_git_commit} != "" ]]; then
-        zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
-    fi
     zfs_src_hash="SKIP"
     zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
     spl_workdir="\${srcdir}/spl"
@@ -101,4 +95,6 @@ update_linux_git_pkgbuilds() {
     fi
     spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
     zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
+    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/kernels/linux.sh b/src/kernels/linux.sh
index c914783..3d32e6b 100644
--- a/src/kernels/linux.sh
+++ b/src/kernels/linux.sh
@@ -82,17 +82,12 @@ update_linux_git_pkgbuilds() {
     spl_pkgbuild_path="packages/${kernel_name}/${spl_pkgname}"
     zfs_pkgbuild_path="packages/${kernel_name}/${zfs_pkgname}"
     spl_src_target="git+${spl_git_url}"
-    if [[ ${spl_git_commit} != "" ]]; then
-        spl_src_target="git+${spl_git_url}#commit=${spl_git_commit}"
-    fi
     spl_src_hash="SKIP"
     linux_depends="\"linux=${kernel_version_full}\""
     linux_headers_depends="\"linux-headers=${kernel_version_full}\""
     spl_makedepends="\"git\""
     zfs_src_target="git+${zfs_git_url}"
-    if [[ ${zfs_git_commit} != "" ]]; then
-        zfs_src_target="git+${zfs_git_url}#commit=${zfs_git_commit}"
-    fi
+
     zfs_src_hash="SKIP"
     zfs_makedepends="\"git\" \"${spl_pkgname}-headers\""
     spl_workdir="\${srcdir}/spl"
@@ -103,4 +98,6 @@ update_linux_git_pkgbuilds() {
     fi
     spl_utils_pkgname="spl-utils-common-git=${spl_git_ver}"
     zfs_utils_pkgname="zfs-utils-common-git=${zfs_git_ver}"
+    spl_src_target="git+${spl_git_url}#commit=${latest_spl_git_commit}"
+    zfs_src_target="git+${zfs_git_url}#commit=${latest_zfs_git_commit}"
 }