summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--recipes-networking/openvswitch/openvswitch-git/Makefile.am-set-the-python3-interpreter-with-usr-bin.patch15
-rw-r--r--recipes-networking/openvswitch/openvswitch_git.bb8
2 files changed, 10 insertions, 13 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>
25 Makefile.am | 2 +- 25 Makefile.am | 2 +-
26 1 file changed, 1 insertion(+), 1 deletion(-) 26 1 file changed, 1 insertion(+), 1 deletion(-)
27 27
28diff --git a/Makefile.am b/Makefile.am 28Index: git/Makefile.am
29index 28e85d422..031bbf39c 100644 29===================================================================
30--- a/Makefile.am 30--- git.orig/Makefile.am
31+++ b/Makefile.am 31+++ git/Makefile.am
32@@ -154,7 +154,7 @@ SUFFIXES += .in 32@@ -162,7 +162,7 @@ SUFFIXES += .in
33 -e 's,[@]PKIDIR[@],$(PKIDIR),g' \ 33 -e 's,[@]PKIDIR[@],$(PKIDIR),g' \
34 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \ 34 -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
35 -e 's,[@]DBDIR[@],$(DBDIR),g' \ 35 -e 's,[@]DBDIR[@],$(DBDIR),g' \
@@ -37,7 +37,4 @@ index 28e85d422..031bbf39c 100644
37+ -e 's,[@]PYTHON3[@],/usr/bin/env $(PYTHON3),g' \ 37+ -e 's,[@]PYTHON3[@],/usr/bin/env $(PYTHON3),g' \
38 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \ 38 -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
39 -e 's,[@]VERSION[@],$(VERSION),g' \ 39 -e 's,[@]VERSION[@],$(VERSION),g' \
40 -e 's,[@]localstatedir[@],$(localstatedir),g' \ 40 -e 's,[@]VERSION_SUFFIX[@],$(VERSION_SUFFIX),g' \
41--
422.35.5
43
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index b7d9b8dd..db831bc4 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -14,13 +14,13 @@ RDEPENDS:${PN}-ptest += "\
14 " 14 "
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17PV = "3.3.0" 17PV = "3.4.1"
18CVE_VERSION = "3.3.0" 18CVE_VERSION = "3.4.1"
19 19
20FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:" 20FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:"
21 21
22SRCREV = "1c1f173ce8a8534e262083bc4db3ee15f05231c0" 22SRCREV = "7aa5f4270f5a96f0c0bb111701b25bb648cbbc43"
23SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-3.3 \ 23SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-3.4 \
24 file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \ 24 file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \
25 file://run-ptest \ 25 file://run-ptest \
26 file://disable_m4_check.patch \ 26 file://disable_m4_check.patch \