From db9f99963e6c0a57a114e70aed6d36817464fa0f Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Wed, 16 Apr 2014 16:22:44 -0700 Subject: [PATCH] Readd pkgver() to the git PKGBUILDS --- spl-git/PKGBUILD | 7 +++++++ spl-utils-git/PKGBUILD | 7 +++++++ zfs-git/PKGBUILD | 11 ++++++++--- zfs-utils-git/PKGBUILD | 9 ++++++++- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/spl-git/PKGBUILD b/spl-git/PKGBUILD index 40915a6..705f632 100644 --- a/spl-git/PKGBUILD +++ b/spl-git/PKGBUILD @@ -44,6 +44,13 @@ install=spl.install provides=("spl") conflicts=("spl") +pkgver() { + cd "${srcdir}/spl" + # cutting off 'spl-' prefix that presents in the git tag + echo $(git describe --long | \ + sed -r 's/^spl-//;s/([^-]*-g)/r\1/;s/-/_/g')_${_kernel_version_clean} +} + build() { cd "$srcdir/spl" ./autogen.sh diff --git a/spl-utils-git/PKGBUILD b/spl-utils-git/PKGBUILD index 832819f..94629a6 100644 --- a/spl-utils-git/PKGBUILD +++ b/spl-utils-git/PKGBUILD @@ -33,6 +33,13 @@ license=("GPL") provides=("spl-utils") conflicts=("spl-utils") +pkgver() { + cd "${srcdir}/spl" + # cutting off 'spl-' prefix that presents in the git tag + echo $(git describe --long | \ + sed -r 's/^spl-//;s/([^-]*-g)/r\1/;s/-/_/g')_${_kernel_version_clean} +} + build() { cd "${srcdir}/spl" ./autogen.sh diff --git a/zfs-git/PKGBUILD b/zfs-git/PKGBUILD index b0a090c..fac6079 100644 --- a/zfs-git/PKGBUILD +++ b/zfs-git/PKGBUILD @@ -32,9 +32,7 @@ else fi pkgdesc="Kernel modules for the Zettabyte File System." -depends=("spl-git=0.6.2_r33_g89aa970_3.14.1_1" - "zfs-utils-git=0.6.2_r254_g0b75bdb_3.14.1_1" - "linux=${_kernel_version}") +depends=("spl-git" "zfs-utils-git" "linux=${_kernel_version}") makedepends=("git" "linux-headers=${_kernel_version}") arch=("i686" "x86_64") url="http://zfsonlinux.org/" @@ -44,6 +42,13 @@ md5sums=('SKIP') license=("CDDL") install=zfs.install +pkgver() { + cd "${srcdir}/zfs" + # cutting off 'spl-' prefix that presents in the git tag + echo $(git describe --long | \ + sed -r 's/^zfs-//;s/([^-]*-g)/r\1/;s/-/_/g')_${_kernel_version_clean} +} + build() { cd "${srcdir}/zfs" ./autogen.sh diff --git a/zfs-utils-git/PKGBUILD b/zfs-utils-git/PKGBUILD index 4aa81e4..aa0f1b2 100644 --- a/zfs-utils-git/PKGBUILD +++ b/zfs-utils-git/PKGBUILD @@ -21,7 +21,7 @@ _kernel_version_x64_clean="3.14.1_1" _kernel_version_clean=${_kernel_version_x64_clean} pkgdesc="Kernel module support files for the Zettabyte File System." -depends=("spl-git=0.6.2_r33_g89aa970_3.14.1_1") +depends=("spl-git") makedepends=("git") arch=("i686" "x86_64") url="http://zfsonlinux.org/" @@ -36,6 +36,13 @@ md5sums=('SKIP' 'b567a95a34759f196bf4be8061a895e5') license=("CDDL") +pkgver() { + cd "${srcdir}/zfs" + # cutting off 'spl-' prefix that presents in the git tag + echo $(git describe --long | \ + sed -r 's/^zfs-//;s/([^-]*-g)/r\1/;s/-/_/g')_${_kernel_version_clean} +} + build() { cd "${srcdir}/zfs" ./autogen.sh