diff options
author | brando56894 | 2017-03-15 15:41:59 -0400 |
---|---|---|
committer | brando56894 | 2017-03-15 15:41:59 -0400 |
commit | ddc3a66e818fe6fd0107bdb88f46a97839c58d80 (patch) | |
tree | 02c6107176a7f86f02f7907323de92d56b67e447 | |
parent | 4194d2fc46c14212c2f9c16777bd3a9e12b9007f (diff) | |
download | aur-freenas-vm-tools-git.tar.gz |
fixed pkgver() and resolved file conflict
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 11 |
2 files changed, 11 insertions, 2 deletions
@@ -1,6 +1,6 @@ pkgbase = freenas-vm-tools-git pkgdesc = Bhyve VM tools for FreeNAS 10 - pkgver = 1.0 + pkgver = r72.ee4a755 pkgrel = 1 url = https://www.freenas.org arch = x86_64 @@ -1,7 +1,7 @@ # Maintainer: Brandon Golway <brando56894 at gmail dot com> _pkgname=freenas-vm-tools pkgname="$_pkgname"-git -pkgver=1.0 +pkgver=r72.ee4a755 pkgrel=1 pkgdesc="Bhyve VM tools for FreeNAS 10" arch=(x86_64) @@ -14,6 +14,14 @@ conflicts=('freenas-vm-tools') source=("git+https://github.com/freenas/${_pkgname}.git") md5sums=('SKIP') +pkgver() { + cd "$_pkgname" + ( set -o pipefail + git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' || + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + ) +} + build() { cd "$_pkgname" export CXX=clang++ @@ -24,6 +32,7 @@ build() { package() { cd "$_pkgname" make DESTDIR="$pkgdir/" install + mv "$pkgdir/usr/sbin" "$pkgdir/usr/bin" cd systemd mkdir -p "$pkgdir"/usr/lib/systemd/system install -m644 freenas-vm-tools.service "$pkgdir"/usr/lib/systemd/system/freenas-vm-tools.service |