diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rwxr-xr-x | PKGBUILD | 23 | ||||
| -rw-r--r-- | openvswitch.install | 1 |
3 files changed, 11 insertions, 21 deletions
@@ -1,6 +1,6 @@ pkgbase = openvswitch-git pkgdesc = Production Quality, Multilayer Open Virtual Switch - pkgver = 2.5.0.r80.g042326c + pkgver = 2.10.1.r64.gd612a4961 pkgrel = 1 epoch = 1 url = http://openvswitch.org @@ -8,14 +8,14 @@ pkgbase = openvswitch-git arch = x86_64 arch = i686 license = APACHE - makedepends = python2 + makedepends = python-six makedepends = git depends = openssl depends = libcap-ng - optdepends = python2 + optdepends = python-six: to run python utilities provides = openvswitch conflicts = openvswitch - source = openvswitch-git::git+https://github.com/openvswitch/ovs.git#branch=branch-2.5 + source = openvswitch-git::git+https://github.com/openvswitch/ovs.git#branch=branch-2.10 source = openvswitch.tmpfiles source = ovsdb-server.service source = ovs-vswitchd.service @@ -5,7 +5,7 @@ # Contributor: Matt Monaco <net 0x01b dgbaley27> pkgname=openvswitch-git -pkgver=2.5.0.r80.g042326c +pkgver=2.10.1.r64.gd612a4961 pkgrel=1 epoch=1 pkgdesc="Production Quality, Multilayer Open Virtual Switch" @@ -13,13 +13,13 @@ url="http://openvswitch.org" license=('APACHE') arch=(x86_64 i686) install=openvswitch.install -source=("$pkgname::git+https://github.com/openvswitch/ovs.git#branch=branch-2.5" +source=("$pkgname::git+https://github.com/openvswitch/ovs.git#branch=branch-2.10" openvswitch.tmpfiles ovsdb-server.service ovs-vswitchd.service) depends=('openssl' 'libcap-ng') -makedepends=('python2' 'git') -optdepends=('python2') +makedepends=('python-six' 'git') +optdepends=('python-six: to run python utilities') md5sums=('SKIP' '0534c19ed27d2ff8c6b32d87c07bc76f' '3a1b706c1adfb1166b58bc9d65ea396f' @@ -32,16 +32,6 @@ pkgver() { git describe --long --tags | sed -E 's/^[^0-9]*//;s/([^-]*-g)/r\1/;s/-/./g' } -prepare() { - cd $pkgname - sed -i \ - -e 's|$(sysconfdir)/bash_completion.d|/usr/share/bash-completion/completions|g' \ - Makefile.am - sed -i -r -e 's,python,&2,;t' vtep/ovs-vtep - sed -i -r -e 's,python,&2,;t' ovn/utilities/ovn-docker-overlay-driver - sed -i -r -e 's,python,&2,;t' ovn/utilities/ovn-docker-underlay-driver -} - build() { cd $pkgname ./boot.sh @@ -50,8 +40,7 @@ build() { --sysconfdir=/etc \ --localstatedir=/var \ --with-rundir=/run/openvswitch \ - --sbindir=/usr/bin \ - PYTHON=/usr/bin/python2 + --sbindir=/usr/bin make } @@ -62,5 +51,7 @@ package() { install -Dm0644 $srcdir/ovsdb-server.service "$pkgdir/usr/lib/systemd/system/ovsdb-server.service" install -Dm0644 $srcdir/ovs-vswitchd.service "$pkgdir/usr/lib/systemd/system/ovs-vswitchd.service" install -dm0755 "$pkgdir/etc/openvswitch" + install -Dm0644 /dev/null "$pkgdir/usr/lib/sysusers.d/ovs.conf" + echo "g ovs - - -" >>"$pkgdir/usr/lib/sysusers.d/ovs.conf" rm -rf $pkgdir/run } diff --git a/openvswitch.install b/openvswitch.install index b9ee27005de6..fa6fb40f20e2 100644 --- a/openvswitch.install +++ b/openvswitch.install @@ -6,7 +6,6 @@ post_install() { printf "Running: %s\n" "${cmd[*]}" "${cmd[@]}" fi - systemd-tmpfiles --create openvswitch.conf } post_upgrade() { |