From e47cd6f12e91dfef4c874193b516869fbac4abda Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 4 Sep 2018 16:12:39 -0400 Subject: openvswitch: uprev to v2.10.0 The current version (v2.9.3) started to fail to build due to changes in openssl. Upstream must have run into similar issues as this was identified and addressed in v2.10.0 by including a copy of 'dhparams.c' instead of relying on it being generated. (see commit "dhparams: Add pregenerated .c file to the repository.") Additionally v2.10.0 is better aligned for our kernel and dpdk versions: kernel === 2.10.x 3.10 to 4.17 dpdk === 2.10.x 17.11.3 The changes in this commit allow for the building of v2.10.0. A second commit will be necessary to deal with a few runtime changes which prevent ovsdb-server from starting correctly. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../openvswitch/openvswitch-git/systemd-update-tool-paths.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch') diff --git a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch index 9a792e63..ec1c1110 100644 --- a/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch +++ b/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch @@ -1,4 +1,4 @@ -From f45c0a9d712113417e7b56c199f8576b470695ae Mon Sep 17 00:00:00 2001 +From 3dbfcb0fa944b57215fab46fe484b02e69ff6e03 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 29 May 2018 18:57:46 +0000 Subject: [PATCH] systemd: update tool paths @@ -28,15 +28,15 @@ index 11b34c6..94c48f8 100644 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ --no-ovsdb-server --no-monitor --system-id=random \ diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service -index 0fa57a9..75c9e02 100644 +index 70da1ec..c2c862f 100644 --- a/rhel/usr_lib_systemd_system_ovsdb-server.service +++ b/rhel/usr_lib_systemd_system_ovsdb-server.service @@ -10,7 +10,7 @@ Type=forking Restart=on-failure EnvironmentFile=/etc/openvswitch/default.conf EnvironmentFile=-/etc/sysconfig/openvswitch --ExecStartPre=/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch -+ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch +-ExecStartPre=/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch ++ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch ExecStartPre=/bin/sh -c 'rm -f /run/openvswitch/useropts; if [ "$${OVS_USER_ID/:*/}" != "root" ]; then /usr/bin/echo "OVSUSER=--ovs-user=${OVS_USER_ID}" > /run/openvswitch/useropts; fi' EnvironmentFile=-/run/openvswitch/useropts ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ -- cgit v1.2.3-54-g00ecf