summaryrefslogtreecommitdiffstats
path: root/recipes-networking/openvswitch/openvswitch-git
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-networking/openvswitch/openvswitch-git')
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-5563e309b80bbea9bff538e71ecfd7e5e538bab9.patch (renamed from recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-7e614671cba3c4e338d1c5003b74a10047d7a8eb.patch)12
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/systemd-update-tool-paths.patch8
2 files changed, 10 insertions, 10 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-7e614671cba3c4e338d1c5003b74a10047d7a8eb.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-5563e309b80bbea9bff538e71ecfd7e5e538bab9.patch
index 5b53f969..a8fc86c9 100644
--- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-7e614671cba3c4e338d1c5003b74a10047d7a8eb.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-5563e309b80bbea9bff538e71ecfd7e5e538bab9.patch
@@ -1,4 +1,4 @@
1From fb68120ef8aed625b04b2fbd2cb78fc59a7b7432 Mon Sep 17 00:00:00 2001 1From 37df262d2b0f0b8c177aa850623f2c5880484ff0 Mon Sep 17 00:00:00 2001
2From: He Zhe <zhe.he@windriver.com> 2From: He Zhe <zhe.he@windriver.com>
3Date: Wed, 30 Mar 2016 06:23:45 -0400 3Date: Wed, 30 Mar 2016 06:23:45 -0400
4Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution 4Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution
@@ -15,22 +15,22 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
15 15
16--- 16---
17 Makefile.am | 1 + 17 Makefile.am | 1 +
18 test.mk | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 18 test.mk | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
19 2 files changed, 73 insertions(+) 19 2 files changed, 75 insertions(+)
20 create mode 100644 test.mk 20 create mode 100644 test.mk
21 21
22diff --git a/Makefile.am b/Makefile.am 22diff --git a/Makefile.am b/Makefile.am
23index ea63acb..ff7d70a 100644 23index 7889728..6435399 100644
24--- a/Makefile.am 24--- a/Makefile.am
25+++ b/Makefile.am 25+++ b/Makefile.am
26@@ -429,3 +429,4 @@ include windows/automake.mk 26@@ -494,3 +494,4 @@ include windows/automake.mk
27 include ovn/automake.mk 27 include ovn/automake.mk
28 include selinux/automake.mk 28 include selinux/automake.mk
29 include build-aux/automake.mk 29 include build-aux/automake.mk
30+include test.mk 30+include test.mk
31diff --git a/test.mk b/test.mk 31diff --git a/test.mk b/test.mk
32new file mode 100644 32new file mode 100644
33index 0000000..b10a581 33index 0000000..0b4587c
34--- /dev/null 34--- /dev/null
35+++ b/test.mk 35+++ b/test.mk
36@@ -0,0 +1,74 @@ 36@@ -0,0 +1,74 @@
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 \