summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9180d4948c7d..8a190c9019d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = zfs-dkms-git
- pkgver = 0.6.5.2_0_g0b7b4bd
+ pkgver = 0.6.5.2_r0_g0b7b4bd
pkgrel = 1
url = http://zfsonlinux.org/
arch = i686
@@ -19,7 +19,7 @@ pkgname = zfs-dkms-git
pkgdesc = Kernel modules for the Zettabyte File System.
install = zfs.install
depends = spl-dkms-git
- depends = zfs-utils-dkms-git=0.6.5.2_0_g0b7b4bd-1
+ depends = zfs-utils-dkms-git=0.6.5.2_r0_g0b7b4bd-1
depends = dkms
provides = zfs-dkms
conflicts = zfs-git
diff --git a/PKGBUILD b/PKGBUILD
index 600a811142d3..cc9bdd31dfe0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgbase="zfs-dkms-git"
pkgname=("zfs-dkms-git" "zfs-utils-dkms-git")
-pkgver=0.6.5.2_0_g0b7b4bd
+pkgver=0.6.5.2_r0_g0b7b4bd
pkgrel=1
license=('CDDL')
makedepends=("git")
@@ -22,7 +22,7 @@ md5sums=('SKIP'
pkgver() {
cd "${srcdir}/zfs"
- git describe --match "zfs-*" --long --tags | sed -e 's|zfs-||g' -e 's|[-: ]|_|g'
+ git describe --match "zfs-*" --long --tags | sed -e 's|zfs-||' -e 's|-\([0-9]*-g\)|-r\1|' -e 's|[-: ]|_|g'
}
build() {
@@ -53,7 +53,7 @@ package_zfs-dkms-git() {
install -d ${pkgdir}/usr/src
cp -a ${srcdir}/zfs ${pkgdir}/usr/src/zfs-${pkgver%%_*}
cd ${pkgdir}/usr/src/zfs-${pkgver%%_*}
- rm -rf .git .gitignore
+ rm -rf .git*
make clean
}