summaryrefslogtreecommitdiffstats
path: root/recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2018-09-04 16:12:39 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-09-04 16:14:18 -0400
commite47cd6f12e91dfef4c874193b516869fbac4abda (patch)
tree7e8ea19a349b0a09120e4e8afbd591c0b988dca4 /recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch
parent5fe3950136d2db42c97cee245b88a893784ab4bc (diff)
downloadmeta-virtualization-e47cd6f12e91dfef4c874193b516869fbac4abda.tar.gz
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 <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch')
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch8
1 files changed, 4 insertions, 4 deletions
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 @@
1From f45c0a9d712113417e7b56c199f8576b470695ae Mon Sep 17 00:00:00 2001 1From 3dbfcb0fa944b57215fab46fe484b02e69ff6e03 Mon Sep 17 00:00:00 2001
2From: Mark Asselstine <mark.asselstine@windriver.com> 2From: Mark Asselstine <mark.asselstine@windriver.com>
3Date: Tue, 29 May 2018 18:57:46 +0000 3Date: Tue, 29 May 2018 18:57:46 +0000
4Subject: [PATCH] systemd: update tool paths 4Subject: [PATCH] systemd: update tool paths
@@ -28,15 +28,15 @@ index 11b34c6..94c48f8 100644
28 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ 28 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \
29 --no-ovsdb-server --no-monitor --system-id=random \ 29 --no-ovsdb-server --no-monitor --system-id=random \
30diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service 30diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service
31index 0fa57a9..75c9e02 100644 31index 70da1ec..c2c862f 100644
32--- a/rhel/usr_lib_systemd_system_ovsdb-server.service 32--- a/rhel/usr_lib_systemd_system_ovsdb-server.service
33+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service 33+++ b/rhel/usr_lib_systemd_system_ovsdb-server.service
34@@ -10,7 +10,7 @@ Type=forking 34@@ -10,7 +10,7 @@ Type=forking
35 Restart=on-failure 35 Restart=on-failure
36 EnvironmentFile=/etc/openvswitch/default.conf 36 EnvironmentFile=/etc/openvswitch/default.conf
37 EnvironmentFile=-/etc/sysconfig/openvswitch 37 EnvironmentFile=-/etc/sysconfig/openvswitch
38-ExecStartPre=/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch 38-ExecStartPre=/usr/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
39+ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch 39+ExecStartPre=/bin/chown ${OVS_USER_ID} /var/run/openvswitch /var/log/openvswitch
40 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' 40 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'
41 EnvironmentFile=-/run/openvswitch/useropts 41 EnvironmentFile=-/run/openvswitch/useropts
42 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \ 42 ExecStart=/usr/share/openvswitch/scripts/ovs-ctl \