Fixed `pkgver()`.

2 files changed, 14 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 816c13e4bb1c..af42cf7da5eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sunxi-livesuite-git
-	pkgver = 1a0b52a
-	pkgrel = 4
+	pkgver = r5.20140913.1a0b52a
+	pkgrel = 1
 	url = https://github.com/linux-sunxi/sunxi-livesuite
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 4f839f7e68d8..39bcd79fb029 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=sunxi-livesuite-git
 pkgname=($pkgbase sunxi-livesuite-dkms-git)
-pkgver=1a0b52a
-pkgrel=4
+pkgver=r5.20140913.1a0b52a
+pkgrel=1
 arch=('x86_64' 'i686')
 url="https://github.com/linux-sunxi/sunxi-livesuite"
 license=('GPLv2')
@@ -23,7 +23,16 @@ sha256sums=('SKIP'
 
 pkgver() {
     cd "${srcdir}/${pkgbase%-git}"
-    git describe --always | sed 's|-|.|g'
+    _rev="$(git rev-list --count HEAD)"
+    _date="$(git log -1 --date=format:"%Y%m%d" --format="%ad")"
+    _hash="$(git rev-parse --short HEAD)"
+
+    if [ -z "${_rev}" ]; then
+        error "Could not determine commit count."
+    return 1
+    else
+        printf '%s' "r${_rev}.${_date}.${_hash}"
+    fi
 }
 
 package_sunxi-livesuite-git() {