diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 32 |
2 files changed, 21 insertions, 19 deletions
@@ -1,7 +1,7 @@ pkgbase = netvirt-agent-beta-git pkgdesc = NetVirt is an open source network virtualization platform (NVP). - pkgver = 0.99.r20.g3798298 - pkgrel = 3798298 + pkgver = v2.0.2b + pkgrel = 1 url = http://netvirt.org arch = i686 arch = x86_64 @@ -9,6 +9,10 @@ pkgbase = netvirt-agent-beta-git makedepends = git makedepends = scons makedepends = cmake + depends = jansson + depends = curl + depends = libevent + depends = openssl source = netvirt-agent-git::git+https://github.com/netvirt/netvirt.git md5sums = SKIP @@ -2,15 +2,15 @@ pkgname=netvirt-agent-beta-git srcgiturl=https://github.com/netvirt/netvirt -pkgver=v0.6.r174.gfc16fbe +pkgver=v2.0.2b pkgrel=1 pkgdesc="NetVirt is an open source network virtualization platform (NVP)." arch=('i686' 'x86_64') url="http://netvirt.org" license=('GPLv3') -depends=() -optdepends=('qt4') -makedepends=('git' 'scons' 'cmake' 'libevent' 'openssl') +depends=('jansson' 'curl' 'libevent' 'openssl') +optdepends=() # 'qt4' +makedepends=('git' 'scons' 'cmake') source=("${pkgname}::git+${srcgiturl}.git") md5sums=('SKIP') @@ -19,13 +19,18 @@ pkgver() { sha=`echo "$gitinfo" | head -n 1 | cut -c -7` tag=`echo "$gitinfo" | tail -n 1 | awk -F "/" {'print $3'}` commits=`curl -s ${srcgiturl}/releases/tag/${tag} | grep -o "[0-9]* commits" | awk {'print $1'}` - printf "%s.r%s.g%s" $tag $commits $sha + if [ "$commit" = "" ]; then + printf $tag + else + printf "%s.r%s.g%s" $tag $commits $sha + fi + } prepare() { cd ${srcdir}/${pkgname} set -e - git checkout proto1.2 + #git checkout proto1.2 git submodule update --init --recursive pushd tapcfg @@ -51,27 +56,20 @@ package() { #TODO: this could/should become a post_install item echo "#!/bin/sh sudo chmod 666 /dev/net/tun - sudo setcap cap_net_bind_service,cap_net_admin=ep /usr/bin/netvirt-agent + sudo setcap cap_net_bind_service,cap_net_admin=ep /usr/bin/netvirt-agent2 " > ${pkgdir}/usr/bin/netvirt-allow_user - # restartd on ubuntu allow to easily create a daemon with any command, - # but unfortunatelly, it does not look to be available under arch linux - #echo "#!/bin/sh - #sudo pacman -S restartd - #echo 'netvirt-agent \"netvirt-agent\" \"sleep 20 && su - \$USER -c netvirt-agent &\" \"\"' | sudo tee -a /etc/restartd.conf - #" > ${pkgdir}/usr/bin/netvirt-daemonize - mkdir -p ${pkgdir}/usr/lib/systemd/system # ArchLinux uses SystemD, Yeah - cat << EOF > ${pkgdir}/usr/lib/systemd/system/netvirt-agent.service + cat << EOF > ${pkgdir}/usr/lib/systemd/system/netvirt-agent2.service [Unit] -Description=Netvirt Agent +Description=Netvirt Agent2 After=network.target [Service] Environment="HOME=/root" -ExecStart=/usr/bin/netvirt-agent +ExecStart=/usr/bin/netvirt-agent2 ExecReload=/bin/kill -HUP $MAINPID KillMode=process Restart=always |