diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2018-09-04 16:12:39 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-09-04 16:14:18 -0400 |
commit | e47cd6f12e91dfef4c874193b516869fbac4abda (patch) | |
tree | 7e8ea19a349b0a09120e4e8afbd591c0b988dca4 /recipes-networking/openvswitch/openvswitch-git | |
parent | 5fe3950136d2db42c97cee245b88a893784ab4bc (diff) | |
download | meta-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')
-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.patch | 8 |
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 @@ | |||
1 | From fb68120ef8aed625b04b2fbd2cb78fc59a7b7432 Mon Sep 17 00:00:00 2001 | 1 | From 37df262d2b0f0b8c177aa850623f2c5880484ff0 Mon Sep 17 00:00:00 2001 |
2 | From: He Zhe <zhe.he@windriver.com> | 2 | From: He Zhe <zhe.he@windriver.com> |
3 | Date: Wed, 30 Mar 2016 06:23:45 -0400 | 3 | Date: Wed, 30 Mar 2016 06:23:45 -0400 |
4 | Subject: [PATCH] openvswitch: Add test-install rule to support ptest execution | 4 | Subject: [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 | ||
22 | diff --git a/Makefile.am b/Makefile.am | 22 | diff --git a/Makefile.am b/Makefile.am |
23 | index ea63acb..ff7d70a 100644 | 23 | index 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 |
31 | diff --git a/test.mk b/test.mk | 31 | diff --git a/test.mk b/test.mk |
32 | new file mode 100644 | 32 | new file mode 100644 |
33 | index 0000000..b10a581 | 33 | index 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 @@ | |||
1 | From f45c0a9d712113417e7b56c199f8576b470695ae Mon Sep 17 00:00:00 2001 | 1 | From 3dbfcb0fa944b57215fab46fe484b02e69ff6e03 Mon Sep 17 00:00:00 2001 |
2 | From: Mark Asselstine <mark.asselstine@windriver.com> | 2 | From: Mark Asselstine <mark.asselstine@windriver.com> |
3 | Date: Tue, 29 May 2018 18:57:46 +0000 | 3 | Date: Tue, 29 May 2018 18:57:46 +0000 |
4 | Subject: [PATCH] systemd: update tool paths | 4 | Subject: [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 \ |
30 | diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service | 30 | diff --git a/rhel/usr_lib_systemd_system_ovsdb-server.service b/rhel/usr_lib_systemd_system_ovsdb-server.service |
31 | index 0fa57a9..75c9e02 100644 | 31 | index 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 \ |