Browse Source
openvswitch: upgrade to 2.8.1 ; package more stuff from the OVS build
I should have packaged the OVN stuff, VTEP and what-not earlier, but was not inspired to do this earlier. I made some time now to package those parts. Disabling flake8 & python3 explicitly. They might get detected and cause weird build errors. Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>lilik-openwrt-22.03
Alexandru Ardelean
7 years ago
4 changed files with 157 additions and 63 deletions
Split View
Diff Options
-
+115 -21net/openvswitch/Makefile
-
+12 -31net/openvswitch/files/etc/init.d/openvswitch.init
-
+30 -0net/openvswitch/patches/0006-adapt-ovs-scripts.patch
-
+0 -11net/openvswitch/patches/0009-fix-test-ovn.patch
+ 115
- 21
net/openvswitch/Makefile
View File
+ 12
- 31
net/openvswitch/files/etc/init.d/openvswitch.init
View File
| @ -1,41 +1,22 @@ | |||
| #!/bin/sh /etc/rc.common | |||
| # Copyright (C) 2013 Julius Schulz-Zander <julius@net.t-labs.tu-berlin.de> | |||
| # Copyright (C) 2014 OpenWrt.org | |||
| # Copyright (C) 2014-2017 OpenWrt.org | |||
| START=15 | |||
| USE_PROCD=1 | |||
| start_service() { | |||
| [ -x /var/run/openvswitch ] || mkdir -p /var/run/openvswitch | |||
| [ -e /etc/openvswitch/conf.db ] || { | |||
| /usr/bin/ovsdb-tool create /etc/openvswitch/conf.db /usr/share/openvswitch/vswitch.ovsschema | |||
| } | |||
| start() { | |||
| /usr/share/openvswitch/scripts/ovs-ctl start | |||
| } | |||
| # ovsdb-server | |||
| procd_open_instance | |||
| procd_set_param command /usr/sbin/ovsdb-server | |||
| procd_append_param command --remote=punix:/var/run/db.sock | |||
| procd_append_param command --remote=db:Open_vSwitch,Open_vSwitch,manager_options | |||
| procd_append_param command --pidfile=/var/run/ovsdb-server.pid | |||
| procd_set_param respawn | |||
| procd_append_param respawn 3600 | |||
| procd_append_param respawn 5 | |||
| procd_append_param respawn -1 | |||
| procd_set_param nice | |||
| procd_append_param nice -10 | |||
| procd_close_instance | |||
| stop() { | |||
| /usr/share/openvswitch/scripts/ovs-ctl stop | |||
| } | |||
| # ovs-vswitchd | |||
| procd_open_instance | |||
| procd_set_param command /usr/sbin/ovs-vswitchd | |||
| procd_append_param command --pidfile=/var/run/ovs-vswitchd.pid | |||
| procd_set_param respawn | |||
| procd_append_param respawn 3600 | |||
| procd_append_param respawn 5 | |||
| procd_append_param respawn -1 | |||
| procd_set_param nice | |||
| procd_append_param nice -10 | |||
| procd_close_instance | |||
| restart() { | |||
| /usr/share/openvswitch/scripts/ovs-ctl restart | |||
| } | |||
| status() { | |||
| /usr/share/openvswitch/scripts/ovs-ctl status | |||
| } | |||
+ 30
- 0
net/openvswitch/patches/0006-adapt-ovs-scripts.patch
View File
| @ -0,0 +1,30 @@ | |||
| diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in | |||
| index dc1d02c..61ecf2f 100755 | |||
| --- a/utilities/ovs-ctl.in | |||
| +++ b/utilities/ovs-ctl.in | |||
| @@ -108,7 +108,7 @@ set_system_ids () { | |||
| esac | |||
| set "$@" external-ids:system-id="\"$SYSTEM_ID\"" | |||
| - set "$@" external-ids:hostname="\"$(hostname -f)\"" | |||
| + set "$@" external-ids:hostname="\"$(cat /proc/sys/kernel/hostname)\"" | |||
| set "$@" external-ids:rundir="\"$rundir\"" | |||
| diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in | |||
| index 8665698..7931bc6 100644 | |||
| --- a/utilities/ovs-lib.in | |||
| +++ b/utilities/ovs-lib.in | |||
| @@ -157,7 +157,11 @@ install_dir () { | |||
| [ "${OVS_USER##*:}" != "" ] && INSTALL_GROUP="${OVS_USER##*:}" | |||
| if test ! -d "$DIR"; then | |||
| - install -d -m "$INSTALL_MODE" -o "$INSTALL_USER" -g "$INSTALL_GROUP" "$DIR" | |||
| + mkdir -p "$DIR" | |||
| + [ -n "$INSTALL_MODE" ] && chmod "$INSTALL_MODE" "$DIR" | |||
| + local OWN="$INSTALL_USER" | |||
| + [ -n "$OWN" ] && [ -n "$INSTALL_GROUP" ] && OWN="${OWN}:${INSTALL_GROUP}" | |||
| + [ -n "$OWN" ] && chown "$OWN" "$DIR" | |||
| restorecon "$DIR" >/dev/null 2>&1 | |||
| fi | |||
| } | |||
+ 0
- 11
net/openvswitch/patches/0009-fix-test-ovn.patch
View File
| @ -1,11 +0,0 @@ | |||
| --- a/tests/test-ovn.c | |||
| +++ b/tests/test-ovn.c | |||
| @@ -1043,7 +1043,7 @@ wait_pid(pid_t *pids, int *n) | |||
| int status; | |||
| pid_t pid; | |||
| - pid = waitpid(WAIT_ANY, &status, 0); | |||
| + pid = waitpid(-1, &status, 0); | |||
| if (pid < 0) { | |||
| ovs_fatal(errno, "waitpid failed"); | |||
| } else if (WIFEXITED(status)) { | |||