4 files changed, 24 insertions, 18 deletions

diff --git a/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch b/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch
index 472ecb57..df08e3d9 100644
--- a/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch
@@ -25,11 +25,11 @@ Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
  Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 28e85d422..031bbf39c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -154,7 +154,7 @@ SUFFIXES += .in
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -162,7 +162,7 @@ SUFFIXES += .in
             -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
             -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
             -e 's,[@]DBDIR[@],$(DBDIR),g' \
@@ -37,7 +37,4 @@ index 28e85d422..031bbf39c 100644
 +           -e 's,[@]PYTHON3[@],/usr/bin/env $(PYTHON3),g' \
             -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
             -e 's,[@]VERSION[@],$(VERSION),g' \
-            -e 's,[@]localstatedir[@],$(localstatedir),g' \
--- 
-2.35.5
-
+            -e 's,[@]VERSION_SUFFIX[@],$(VERSION_SUFFIX),g' \
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch
index 571753a5..abad1458 100644
--- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch
@@ -16,6 +16,13 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
 refresh patch to fix patch-fuzz warning
 Signed-off-by: Changqing Li <changqing.li@windriver.com>
 
+Refresh patch to fix file ptest/tests/atlocal 
+contains reference to TMPDIR [buildpaths]. The fix is:
+ - set EGREP to "grep -E" in ptest/tests/atlocal
+ - set CFLAGS to " " in ptest/tests/atlocal
+
+Signed-off-by: Bin Lan <bin.lan.cn@windriver.com>
+
 Upstream-Status: Inappropriate [embedded specific]
 ---
  Makefile.am |  1 +
@@ -37,7 +44,7 @@ new file mode 100644
 index 0000000..0b4587c
 --- /dev/null
 +++ b/test.mk
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,76 @@
 +TEST_DEST ?= ${prefix}/lib/openvswitch
 +TEST_ROOT ?= ${prefix}/lib/openvswitch
 +TEST_DEPEND =
@@ -112,3 +119,5 @@ index 0000000..0b4587c
 +       sed -i 's|$$srcdir|$$abs_srcdir|g' $(TEST_DEST)/tests/testsuite
 +       sed -i 's|ovs-appctl-bashcomp\.bash|/etc/bash_completion.d/ovs-appctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite
 +       sed -i 's|ovs-vsctl-bashcomp\.bash|/etc/bash_completion.d/ovs-vsctl-bashcomp\.bash|g' $(TEST_DEST)/tests/testsuite
++       sed -i 's|EGREP=.*|EGREP='"'"'grep -E'"'"'|g' $(TEST_DEST)/tests/atlocal
++       sed -i 's|CFLAGS=.*|CFLAGS='"'"' '"'"'|g' $(TEST_DEST)/tests/atlocal
diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc
index 767a41e6..a792a903 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -104,13 +104,13 @@ do_install:prepend() {
 
 do_install:append() {
         install -d ${D}/${sysconfdir}/default/
-        install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch
+        install -m 660 ${UNPACKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch
         install -d ${D}/${sysconfdir}/openvswitch-testcontroller
-        install -m 660 ${WORKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller
+        install -m 660 ${UNPACKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller
 
         install -d ${D}/${sysconfdir}/init.d/
-        install -m 755 ${WORKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller
-        install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
+        install -m 755 ${UNPACKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller
+        install -m 755 ${UNPACKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
         true || rm -fr ${D}/${datadir}/${PN}/pki
 
         install -d ${D}/${sysconfdir}/sysconfig
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index b7d9b8dd..8637165a 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -14,13 +14,13 @@ RDEPENDS:${PN}-ptest += "\
         "
 
 S = "${WORKDIR}/git"
-PV = "3.3.0"
-CVE_VERSION = "3.3.0"
+PV = "3.5.0"
+CVE_VERSION = "3.5.0"
 
 FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:"
 
-SRCREV = "1c1f173ce8a8534e262083bc4db3ee15f05231c0"
-SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-3.3 \
+SRCREV = "445594155310a881ea4a269e2a424a870a89402c"
+SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-3.5 \
             file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \
             file://run-ptest \
             file://disable_m4_check.patch \