diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2017-03-29 11:26:15 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2017-03-29 21:53:57 -0400 |
commit | 4e130b716553e2360437f9a47039aa64602d1213 (patch) | |
tree | 9dff1e6d764cf4cf0a2ec64a694338f495193824 /recipes-networking/openvswitch/openvswitch-git | |
parent | ea05b2693aa6eae10a5f59aa7a47e52b4c4b4acd (diff) | |
download | meta-virtualization-4e130b716553e2360437f9a47039aa64602d1213.tar.gz |
openvswitch: uprev to the recently released v2.7.0
This version of OVS was released on Feb. 21. Bringing our recipe up to
date with the latest release ensure we have all the latest CVE fixes
as well as any new functionality that folks might be looking
for. Additionally we are better situated to support up to date
releases of DPDK (v16.11 in this case). No surprises with the uprev,
it passes all usecase tests (meta-overc) and ptest results are much
the same as the results we had in v2.6.1. While completing the uprev I
took the opportunity to do some cleanup of patches that were no longer
used or required.
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-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch (renamed from recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3.patch) | 10 | ||||
-rw-r--r-- | recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch | 30 |
2 files changed, 5 insertions, 35 deletions
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch index 7e740441..47c81dd9 100644 --- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-f4b0e64cffb4777ff03d48621c3eadcf1d8c19f3.patch +++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-c298ef781c2d35d939fe163cbc2f41ea7b1cb8d1.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e20556d7cf0fc8258db77c1f3e0a160cf9fd4514 Mon Sep 17 00:00:00 2001 | 1 | From a2a656e6976a60e5df3ade0d17a40b4ebdc2b41a 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 |
@@ -19,13 +19,13 @@ Signed-off-by: He Zhe <zhe.he@windriver.com> | |||
19 | create mode 100644 test.mk | 19 | create mode 100644 test.mk |
20 | 20 | ||
21 | diff --git a/Makefile.am b/Makefile.am | 21 | diff --git a/Makefile.am b/Makefile.am |
22 | index ed43c2f..f38d278 100644 | 22 | index a4dd7b8..0bd32c7 100644 |
23 | --- a/Makefile.am | 23 | --- a/Makefile.am |
24 | +++ b/Makefile.am | 24 | +++ b/Makefile.am |
25 | @@ -401,3 +401,4 @@ include datapath-windows/include/automake.mk | 25 | @@ -429,3 +429,4 @@ include windows/automake.mk |
26 | include windows/automake.mk | ||
27 | include ovn/automake.mk | 26 | include ovn/automake.mk |
28 | include selinux/automake.mk | 27 | include selinux/automake.mk |
28 | include build-aux/automake.mk | ||
29 | +include test.mk | 29 | +include test.mk |
30 | diff --git a/test.mk b/test.mk | 30 | diff --git a/test.mk b/test.mk |
31 | new file mode 100644 | 31 | new file mode 100644 |
@@ -106,5 +106,5 @@ index 0000000..b10a581 | |||
106 | + sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite | 106 | + sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite |
107 | + sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite | 107 | + sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite |
108 | -- | 108 | -- |
109 | 1.9.1 | 109 | 2.7.4 |
110 | 110 | ||
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch deleted file mode 100644 index c75ebc50..00000000 --- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-ptest-Fix-python-path.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 2a78bddb865e0d3377f437428ed6825195af0a14 Mon Sep 17 00:00:00 2001 | ||
2 | From: He Zhe <zhe.he@windriver.com> | ||
3 | Date: Wed, 13 Apr 2016 03:13:01 -0400 | ||
4 | Subject: [PATCH] openvswitch: ptest: Fix python path | ||
5 | |||
6 | For now PYTHON just happens to be the same as TARGET_PYTHON so we get the right | ||
7 | python binary. This patch sets PYTHON to TARGET_PYTHON since ptest is going to | ||
8 | be run on target. | ||
9 | |||
10 | Signed-off-by: He Zhe <zhe.he@windriver.com> | ||
11 | --- | ||
12 | tests/atlocal.in | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/tests/atlocal.in b/tests/atlocal.in | ||
16 | index 5815c6c..db2d2c9 100644 | ||
17 | --- a/tests/atlocal.in | ||
18 | +++ b/tests/atlocal.in | ||
19 | @@ -5,7 +5,7 @@ EGREP='@EGREP@' | ||
20 | PERL='@PERL@' | ||
21 | |||
22 | if test x"$PYTHON" = x; then | ||
23 | - PYTHON='@PYTHON@' | ||
24 | + PYTHON='@TARGET_PYTHON@' | ||
25 | fi | ||
26 | |||
27 | PYTHONPATH=$abs_top_srcdir/python:$abs_top_builddir/tests:$PYTHONPATH | ||
28 | -- | ||
29 | 1.9.1 | ||
30 | |||