change to git-describe based pkgver

2 files changed, 25 insertions, 32 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 194ad714602f..c0504398c7bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,31 @@
 #
-# Maintainer: isiachi <isiachi@rhyeworld.it>
+# Maintainer: bjin <bjin1990 at gmail dot com>
+# Contributor: isiachi <isiachi@rhyeworld.it>
 #
 
 pkgbase="spl-dkms-git"
 pkgname=("spl-dkms-git" "spl-utils-dkms-git")
-pkgver=0.6.4.2
+pkgver=0.6.5.2_0_g2fd6834
 pkgrel=1
 license=('GPL')
 makedepends=("git")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/spl.git"
+source=("git+https://github.com/zfsonlinux/spl.git#tag=spl-0.6.5.2"
         "spl-utils.hostid")
 md5sums=('SKIP'
          'a54f0041a9e15b050f25c463f1db7449')
-#install=spl.install
 
-_dirver="${pkgver}"
-_gittag="spl-${pkgver}"
-
-prepare() {
+pkgver() {
     cd "${srcdir}/spl"
-
-    git checkout ${_gittag}
+    git describe --match "spl-*" --long --tags | sed -e 's|spl-||g' -e 's|[-: ]|_|g'
 }
 
 build() {
     cd "${srcdir}/spl"
     ./autogen.sh
-    scripts/dkms.mkconf -v ${_dirver} -f dkms.conf -n spl
-    
+    scripts/dkms.mkconf -v ${pkgver%%_*} -f dkms.conf -n spl
+
     _at_enable=""
     [ "${CARCH}" == "i686"  ] && _at_enable="--enable-atomic-spinlocks"
 
@@ -45,22 +41,21 @@ build() {
 package_spl-dkms-git() {
     pkgdesc="Solaris Porting Layer kernel modules."
     depends=("dkms" "spl-utils-dkms-git=${pkgver}-${pkgrel}")
-    provides=("spl-git")
-    conflicts=("spl-lts")
+    provides=("spl-dkms")
+    conflicts=("spl-git" "spl-lts" "spl-dkms")
     install=spl.install
-    
+
     install -d ${pkgdir}/usr/src
-    cp -a ${srcdir}/spl ${pkgdir}/usr/src/spl-${_dirver}
-    rm -rf ${pkgdir}/usr/src/spl-${_dirver}/.git
-    rm -f ${pkgdir}/usr/src/spl-${_dirver}/.gitignore
-    
+    cp -a ${srcdir}/spl ${pkgdir}/usr/src/spl-${pkgver%%_*}
+    cd ${pkgdir}/usr/src/spl-${pkgver%%_*}
+    rm -rf .git .gitignore
+    make clean
 }
 
 package_spl-utils-dkms-git() {
     pkgdesc="Solaris Porting Layer kernel module support files."
-    makedepends=("git")
-    provides=("spl-utils-git")
-    conflicts=("spl-utils-lts")
+    provides=("spl-utils")
+    conflicts=("spl-utils-git" "spl-utils-lts" "spl-utils")
 
     cd "${srcdir}/spl"
     make DESTDIR="${pkgdir}" install
diff --git a/spl.install b/spl.install
index 1ce2c6571619..5b7c4cdf8bc3 100644
--- a/spl.install
+++ b/spl.install
@@ -1,17 +1,15 @@
 post_install() {
-    check_initramfs
+    dkms install spl/${1%%[_-]*}
 }
 
-post_upgrade() {
-    check_initramfs
+pre_upgrade() {
+    pre_remove ${2%%[_-]*}
 }
 
-check_initramfs() {    
-    echo " >>>  To build the module for the current kernel use this command:
-        # dkms install spl/0.6.4 -k _KERNEL_VERSION_HERE_
-      or just boot to kernel you want to built and do
-        # dkms install spl/0.6.4 -k \$(uname -r)
+post_upgrade() {
+    post_install ${1%%[_-]*}
+}
 
- >>>  Always remember to install kernel headers!
-"
+pre_remove() {
+    dkms remove spl/${1%%[_-]*} --all
 }