mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 20:59:41 +02:00
e47cd6f12e
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>
46 lines
2.2 KiB
Diff
46 lines
2.2 KiB
Diff
From 3dbfcb0fa944b57215fab46fe484b02e69ff6e03 Mon Sep 17 00:00:00 2001
|
|
From: Mark Asselstine <mark.asselstine@windriver.com>
|
|
Date: Tue, 29 May 2018 18:57:46 +0000
|
|
Subject: [PATCH] systemd: update tool paths
|
|
|
|
We are using the rhel files but we install our tools in a slightly
|
|
different path, update accordingly.
|
|
|
|
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
|
|
---
|
|
rhel/usr_lib_systemd_system_ovs-vswitchd.service.in | 4 ++--
|
|
rhel/usr_lib_systemd_system_ovsdb-server.service | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
|
|
index 11b34c6..94c48f8 100644
|
|
--- a/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
|
|
+++ b/rhel/usr_lib_systemd_system_ovs-vswitchd.service.in
|
|
@@ -15,8 +15,8 @@ EnvironmentFile=/etc/openvswitch/default.conf
|
|
EnvironmentFile=-/etc/sysconfig/openvswitch
|
|
EnvironmentFile=-/run/openvswitch/useropts
|
|
@begin_dpdk@
|
|
-ExecStartPre=-/bin/sh -c '/usr/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages'
|
|
-ExecStartPre=-/usr/bin/chmod 0775 /dev/hugepages
|
|
+ExecStartPre=-/bin/sh -c '/bin/chown :$${OVS_USER_ID##*:} /dev/hugepages'
|
|
+ExecStartPre=-/bin/chmod 0775 /dev/hugepages
|
|
@end_dpdk@
|
|
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 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 /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 \
|
|
--
|
|
2.7.4
|
|
|