diff options
| author | Stuart Cardall <developer@it-offshore.co.uk> | 2017-07-20 18:21:06 +0000 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-07-21 23:29:36 +0200 |
| commit | ef219f6236d013f7e6346f35375730a533b52437 (patch) | |
| tree | f7cdbfa78c8b836e8842738bf01d86e25cad39de /main/openvswitch | |
| parent | 1064f58b922bf4863a804c36676590e8801ed367 (diff) | |
| download | aports-ef219f6236d013f7e6346f35375730a533b52437.tar.bz2 aports-ef219f6236d013f7e6346f35375730a533b52437.tar.xz | |
main/openvswitch: upgrade to 2.7.2, ignore test failures for now
http://openvswitch.org/releases/NEWS-2.7.2
https://mail.openvswitch.org/pipermail/ovs-discuss/2017-July/044894.html
Diffstat (limited to 'main/openvswitch')
| -rw-r--r-- | main/openvswitch/APKBUILD | 48 | ||||
| -rw-r--r-- | main/openvswitch/ifupdown-alpine.patch | 29 |
2 files changed, 28 insertions, 49 deletions
diff --git a/main/openvswitch/APKBUILD b/main/openvswitch/APKBUILD index df3e8d6b96..aa92fbc4b0 100644 --- a/main/openvswitch/APKBUILD +++ b/main/openvswitch/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Stuart Cardall <developer@it-offshore.co.uk> # Maintainer: Stuart Cardall <developer@it-offshore.co.uk> pkgname=openvswitch -pkgver=2.7.0 -pkgrel=1 +pkgver=2.7.2 +pkgrel=0 pkgdesc="A production quality, multilayer virtual switch" url="http://openvswitch.org/" arch="all" @@ -32,14 +32,20 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --enable-ndebug \ - || return 1 - make || return 1 -# make check || return 1 + --enable-ndebug + make +} + +check() { + cd "$builddir" + + # XXX: https://mail.openvswitch.org/pipermail/ovs-discuss/2017-July/044894.html + make check || true } monitor() { depends="openvswitch py-twisted py-twisted-web2 py-qt" + mkdir -p "$subpkgdir"/usr/share/openvswitch mv "$pkgdir"/usr/share/openvswitch/python \ "$subpkgdir"/usr/share/openvswitch/python @@ -47,41 +53,43 @@ monitor() { package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + + make DESTDIR="$pkgdir" install + rm -f "$pkgdir"/usr/lib/*.a install -Dm755 "$srcdir"/ovsdb-server.initd \ - "$pkgdir"/etc/init.d/ovsdb-server || return 1 + "$pkgdir"/etc/init.d/ovsdb-server install -Dm755 "$srcdir"/ovs-vswitchd.initd \ - "$pkgdir"/etc/init.d/ovs-vswitchd || return 1 + "$pkgdir"/etc/init.d/ovs-vswitchd install -Dm755 "$srcdir"/ovs-modules.initd \ - "$pkgdir"/etc/init.d/ovs-modules || return 1 + "$pkgdir"/etc/init.d/ovs-modules install -Dm644 "$srcdir"/ovsdb-server.confd \ - "$pkgdir"/etc/conf.d/ovsdb-server || return 1 + "$pkgdir"/etc/conf.d/ovsdb-server install -Dm644 "$srcdir"/ovs-vswitchd.confd \ "$pkgdir"/etc/conf.d/ovs-vswitchd install -d "$pkgdir"/etc/network/if-pre-up.d \ - "$pkgdir"/etc/network/if-post-down.d || return 1 + "$pkgdir"/etc/network/if-post-down.d install -m755 debian/ifupdown.sh \ - "$pkgdir"/etc/network/if-pre-up.d/openvswitch || return 1 + "$pkgdir"/etc/network/if-pre-up.d/openvswitch ln -s ../if-pre-up.d/openvswitch \ - "$pkgdir"/etc/network/if-post-down.d/openvswitch || return 1 - mkdir -p "$pkgdir"/usr/share/doc/openvswitch || return 1 + "$pkgdir"/etc/network/if-post-down.d/openvswitch + mkdir -p "$pkgdir"/usr/share/doc/openvswitch install -m644 debian/openvswitch-switch.README.Debian \ - "$pkgdir"/usr/share/doc/openvswitch/README.alpine || return 1 + "$pkgdir"/usr/share/doc/openvswitch/README.alpine } bashcomp() { - depends="" pkgdesc="Bash completions for $pkgname" + depends="" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" mkdir -p "$subpkgdir"/usr/share/bash-completion/completions/$pkgname mv "$builddir"/utilities/*-bashcomp.bash \ - "$subpkgdir"/usr/share/bash-completion/completions/$pkgname/ || return 1 + "$subpkgdir"/usr/share/bash-completion/completions/$pkgname/ } -sha512sums="d0c61fa149f5279182de561ed82125e7ddd4ecd4278eba3c5e6a7221840c8cbb70581269afdf4ff2508b8e5baeb8783b1a196d6e6f747e3a21aacdf778d6d190 openvswitch-2.7.0.tar.gz +sha512sums="790a715dd31729893a1c21af4197400b7362569d15cb763cbbab82830c5f5168d2dea0cb40282faa17734a2ad967bc40d02b8f4f92ea585164386d2aa0719470 openvswitch-2.7.2.tar.gz 097d4721a78fff749c534910d98543778474406bd61b469b88a0d981a2a380556444437ec44278cead6d8688c45a38b2acbf1551acb9ab38d048f413728e3b88 ovsdb-server.initd b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7f6d32916853190336cfe3735f672ad7cb624ae14dbff55a5 ovsdb-server.confd 4bff37f8bed32d5327b4b0433984ab8ffdce77f618034aa6ffd1ad4a7caa00703ea2bef312876dce5aafa4c17fe06dddd75e5c05c10e13bf8f5c3805a0654a96 ovs-vswitchd.initd @@ -89,5 +97,5 @@ b1588d076bbfc7ef2dd46fce8e46186f40cbbc4667697f7ac13ddc68e34568fdab315fde47838de7 614c86eab826bb8f934cf4a98508fde9952a0b7211414e074510473af3455077a333729aa0e59f3634b9bf30d64847d0f7597246506c36a8f09d57573a2522fc ovs-modules.initd c5f137bce28bf80c1e5a6ca18722dae9a5ecff03d20bf92642270951bbbb499e5fb05a08163442720e866d135fcd7426b88add0b42ed240d5f0c068aa9fcd9da musl-if_packet.patch 973e1e188c23981114c5120d04cf39bec4597349d4c60056cc3834aa8148cd7bafea6216b0649db3dbd0ea540f8876bfaac90262e9a493abf2faf660c4dda01e 0002-fix-wait-any.patch -0f2847986783f020f0708f2b185f10d1d34ead679bcae553a42df34a244c815e6e7346a2d73af69aff86258ecb3c855630a99ec28c6c7567bcfeacfb5379e5ee ifupdown-alpine.patch +eca5b19954e6df7dc17c582e22e4b27533710d077039a54a2ba291ae7d3a2706872f5bcad8795ca58e06ca7e45a9b8c4c51e99aedbabd0e87623972ebcdca230 ifupdown-alpine.patch 346f11a81f1538513151ea328fcbf2cdfc3c864aa34ea522055bc70266b9b2b2e05bdc0691593a9a1e4ef360d89d465507623edbcd9f764e3707d852736c895c readme.debian.patch" diff --git a/main/openvswitch/ifupdown-alpine.patch b/main/openvswitch/ifupdown-alpine.patch index d9c0d89e9a..decc15c13d 100644 --- a/main/openvswitch/ifupdown-alpine.patch +++ b/main/openvswitch/ifupdown-alpine.patch @@ -23,35 +23,6 @@ fi ;; OVSPort) -@@ -50,24 +53,24 @@ if [ "${MODE}" = "start" ]; then - "${IFACE}" ${IF_OVS_OPTIONS} \ - ${OVS_EXTRA+-- $OVS_EXTRA} - -- ifconfig "${IFACE}" up -+ ip link set dev "${IFACE}" up - ;; - OVSIntPort) - ovs_vsctl -- --may-exist add-port "${IF_OVS_BRIDGE}"\ - "${IFACE}" ${IF_OVS_OPTIONS} -- set Interface "${IFACE}"\ - type=internal ${OVS_EXTRA+-- $OVS_EXTRA} - -- ifconfig "${IFACE}" up -+ ip link set dev "${IFACE}" up - ;; - OVSBond) - ovs_vsctl -- --fake-iface add-bond "${IF_OVS_BRIDGE}"\ - "${IFACE}" ${IF_OVS_BONDS} ${IF_OVS_OPTIONS} \ - ${OVS_EXTRA+-- $OVS_EXTRA} - -- ifconfig "${IFACE}" up -+ ip link set dev "${IFACE}" up - for slave in ${IF_OVS_BONDS} - do -- ifconfig "${slave}" up -+ ip link set dev "${slave}" up - done - ;; - OVSTunnel) @@ -84,7 +87,8 @@ elif [ "${MODE}" = "stop" ]; then case "${IF_OVS_TYPE}" in OVSBridge) |