From 46ed3d369f964456b86a8cf9621d76a1c7714447 Mon Sep 17 00:00:00 2001
From: Jan Houben <jan@et.tc>
Date: Fri, 8 Dec 2017 21:16:40 +0100
Subject: [PATCH] Use a version containing the date of the latest commit for
 git packages

---
 lib.sh                    | 2 +-
 src/spl-dkms/PKGBUILD.sh  | 4 ++--
 src/spl-utils/PKGBUILD.sh | 2 +-
 src/spl/PKGBUILD.sh       | 2 +-
 src/zfs-dkms/PKGBUILD.sh  | 3 +--
 src/zfs-utils/PKGBUILD.sh | 2 +-
 src/zfs/PKGBUILD.sh       | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib.sh b/lib.sh
index c83e36a..d1c1e43 100644
--- a/lib.sh
+++ b/lib.sh
@@ -829,7 +829,7 @@ git_calc_pkgver() {
         # Get the version number past the last tag
         msg2 "Calculating PKGVER"
         cmd="cd temp/${repo} && "
-        cmd+="echo \$(git describe --long | sed -r 's/^${repo}-//;s/([^-]*-g)/r\1/;s/-/./g')"
+        cmd+='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)"'
 
         run_cmd_no_output_no_dry_run "${cmd}"
 
diff --git a/src/spl-dkms/PKGBUILD.sh b/src/spl-dkms/PKGBUILD.sh
index 014b572..b089b9e 100755
--- a/src/spl-dkms/PKGBUILD.sh
+++ b/src/spl-dkms/PKGBUILD.sh
@@ -17,7 +17,7 @@ provides=("spl")
 groups=("${archzfs_package_group}")
 conflicts=(${spl_conflicts} ${spl_conflicts_all} ${spl_headers_conflicts_all})
 ${spl_replaces}
-    
+
 build() {
     cd "${spl_workdir}"
     ./autogen.sh
@@ -42,7 +42,7 @@ package() {
 EOF
 
 if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/ i pkgver() { \n    cd \"${spl_workdir}\" \n    git describe --long | sed 's/^spl-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g' \n}" ${spl_dkms_pkgbuild_path}/PKGBUILD
+	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 8ebec75..115abbd 100755
--- a/src/spl-utils/PKGBUILD.sh
+++ b/src/spl-utils/PKGBUILD.sh
@@ -31,7 +31,7 @@ package() {
 EOF
 
 if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() {\n    cd \"${spl_workdir}\"\n    git describe --long | sed 's/^spl-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g'\n}" ${spl_utils_pkgbuild_path}/PKGBUILD
+	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 03b9fe2..275a558 100755
--- a/src/spl/PKGBUILD.sh
+++ b/src/spl/PKGBUILD.sh
@@ -55,7 +55,7 @@ package_${spl_pkgname}-headers() {
 EOF
 
 if [[ ${archzfs_package_group} =~ -git$ ]]; then
-    sed -i "/^build()/i pkgver() {\n    cd \"${spl_workdir}\"\n    echo \$(git describe --long | sed 's/^spl-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g').${kernel_version_full_pkgver}\n}" ${spl_pkgbuild_path}/PKGBUILD
+    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
     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 9bcb128..4fcaad8 100755
--- a/src/zfs-dkms/PKGBUILD.sh
+++ b/src/zfs-dkms/PKGBUILD.sh
@@ -2,7 +2,6 @@
 
 cat << EOF > ${zfs_dkms_pkgbuild_path}/PKGBUILD
 ${header}
-pkgbase="${zfs_pkgname}"
 pkgname="${zfs_pkgname}"
 pkgdesc="Kernel modules for the Zettabyte File System."
 pkgver=${zfs_pkgver}
@@ -46,7 +45,7 @@ package() {
 EOF
 
 if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() {\n    cd \"${zfs_workdir}\"\n    git describe --long | sed 's/^zfs-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g'\n}" ${zfs_dkms_pkgbuild_path}/PKGBUILD
+	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 8db7d64..e63a805 100755
--- a/src/zfs-utils/PKGBUILD.sh
+++ b/src/zfs-utils/PKGBUILD.sh
@@ -59,7 +59,7 @@ package() {
 EOF
 
 if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() {\n    cd \"${zfs_workdir}\"\n    git describe --long | sed 's/^zfs-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g'\n}" ${zfs_utils_pkgbuild_path}/PKGBUILD
+	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 48f8821..12e022c 100755
--- a/src/zfs/PKGBUILD.sh
+++ b/src/zfs/PKGBUILD.sh
@@ -57,7 +57,7 @@ package_${zfs_pkgname}-headers() {
 EOF
 
 if [[ ${archzfs_package_group} =~ -git$ ]]; then
-	sed -i "/^build()/i pkgver() {\n    cd \"${zfs_workdir}\"\n    echo \$(git describe --long | sed 's/^zfs-//;s/\\\([^-]*-g\\\)/r\\\1/;s/-/./g').${kernel_version_full_pkgver}\n}" ${zfs_pkgbuild_path}/PKGBUILD
+	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"