[meta-virtualization] [PATCH 1/1] openvswith: Uprev to latest version 2.5.0
zhe.he at windriver.com
zhe.he at windriver.com
Tue Mar 29 03:22:24 PDT 2016
From: He Zhe <zhe.he at windriver.com>
Uprev to git rev bb429e09f7783f1ba23ac0682ed9edf424f0cfbb (based on 2.5.0)
Signed-off-by: He Zhe <zhe.he at windriver.com>
---
...-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch | 69 ++++++++++++++++++++++
...-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch | 69 ----------------------
recipes-networking/openvswitch/openvswitch_git.bb | 8 +--
3 files changed, 73 insertions(+), 73 deletions(-)
create mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch
delete mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch
new file mode 100644
index 0000000..b79cb1b
--- /dev/null
+++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-8c0b419a0b9ac0141d6973dcc80306dfc6a83d31.patch
@@ -0,0 +1,69 @@
+Add test-install rule to support ptest execution
+
+Signed-off-by: Radu Patriu <radu.patriu at enea.com>
+
+---
+ Makefile.am | 2 ++
+ test.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 51 insertions(+)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -401,3 +401,5 @@
+ include windows/automake.mk
+ include ovn/automake.mk
+ include selinux/automake.mk
++include test.mk
++
+--- /dev/null
++++ b/test.mk
+@@ -0,0 +1,49 @@
++TEST_DEST ?= ${prefix}/lib/openvswitch
++TEST_ROOT ?= ${prefix}/lib/openvswitch
++TEST_DEPEND =
++
++if HAVE_OPENSSL
++TEST_DEPEND += $(TESTPKI_FILES)
++endif
++
++test-install: $(TEST_DEPEND)
++ @list='$(noinst_PROGRAMS) $(EXTRA_DIST) $(dist_check_SCRIPTS) $(TEST_DEPEND) tests/atlocal tests/atconfig' ;\
++ install -d $(TEST_DEST)/tests ;\
++ install -d $(TEST_DEST)/python ;\
++ install -d $(TEST_DEST)/python/ovs ;\
++ install -d $(TEST_DEST)/python/ovs/db ;\
++ install -d $(TEST_DEST)/python/ovs/unixctl ;\
++ install -d $(TEST_DEST)/vswitchd ;\
++ install vswitchd/vswitch.ovsschema $(TEST_DEST)/vswitchd ;\
++ install -d $(TEST_DEST)/debian ;\
++ install debian/ovs-monitor-ipsec $(TEST_DEST)/debian ;\
++ install -d $(TEST_DEST)/build-aux ;\
++ install build-aux/check-structs $(TEST_DEST)/build-aux ;\
++ install -d $(TEST_DEST)/xenserver ;\
++ install xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync $(TEST_DEST)/xenserver ;\
++ install xenserver/opt_xensource_libexec_interface-reconfigure $(TEST_DEST)/xenserver ;\
++ install xenserver/opt_xensource_libexec_InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\
++ install xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\
++ install xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\
++ install -d $(TEST_DEST)/vtep ;\
++ install vtep/vtep.ovsschema $(TEST_DEST)/vtep ;\
++ for p in $$list ; do \
++ echo $$p ;\
++ p=$${p#./} ;\
++ pre=$${p#tests\/} ;\
++ if test $$pre != $$p ; then \
++ echo installing $$p to $(TEST_DEST)/tests/$$pre ;\
++ install $$p $(TEST_DEST)/tests/$$pre ;\
++ continue ;\
++ fi ;\
++ pre=$${p#python\/ovs\/} ;\
++ if test $$pre != $$p ; then \
++ echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\
++ install $$p $(TEST_DEST)/python/ovs/$$pre ;\
++ continue ;\
++ fi; \
++ done ;\
++ sed -i 's|abs_builddir=.*|abs_builddir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig
++ sed -i 's|abs_srcdir=.*|abs_srcdir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig
++ sed -i 's|abs_top_srcdir=.*|abs_top_srcdir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig
++ sed -i 's|abs_top_builddir=.*|abs_top_builddir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
deleted file mode 100644
index c8ebff1..0000000
--- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Add test-install rule to support ptest execution
-
-Signed-off-by: Radu Patriu <radu.patriu at enea.com>
-
----
- Makefile.am | 2 ++
- test.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 51 insertions(+)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -382,3 +382,5 @@
- include datapath-windows/automake.mk
- include datapath-windows/include/automake.mk
- include windows/automake.mk
-+include test.mk
-+
---- /dev/null
-+++ b/test.mk
-@@ -0,0 +1,49 @@
-+TEST_DEST ?= ${prefix}/lib/openvswitch
-+TEST_ROOT ?= ${prefix}/lib/openvswitch
-+TEST_DEPEND =
-+
-+if HAVE_OPENSSL
-+TEST_DEPEND += $(TESTPKI_FILES)
-+endif
-+
-+test-install: $(TEST_DEPEND)
-+ @list='$(noinst_PROGRAMS) $(EXTRA_DIST) $(dist_check_SCRIPTS) $(TEST_DEPEND) tests/atlocal tests/atconfig' ;\
-+ install -d $(TEST_DEST)/tests ;\
-+ install -d $(TEST_DEST)/python ;\
-+ install -d $(TEST_DEST)/python/ovs ;\
-+ install -d $(TEST_DEST)/python/ovs/db ;\
-+ install -d $(TEST_DEST)/python/ovs/unixctl ;\
-+ install -d $(TEST_DEST)/vswitchd ;\
-+ install vswitchd/vswitch.ovsschema $(TEST_DEST)/vswitchd ;\
-+ install -d $(TEST_DEST)/debian ;\
-+ install debian/ovs-monitor-ipsec $(TEST_DEST)/debian ;\
-+ install -d $(TEST_DEST)/build-aux ;\
-+ install build-aux/check-structs $(TEST_DEST)/build-aux ;\
-+ install -d $(TEST_DEST)/xenserver ;\
-+ install xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync $(TEST_DEST)/xenserver ;\
-+ install xenserver/opt_xensource_libexec_interface-reconfigure $(TEST_DEST)/xenserver ;\
-+ install xenserver/opt_xensource_libexec_InterfaceReconfigure.py $(TEST_DEST)/xenserver ;\
-+ install xenserver/opt_xensource_libexec_InterfaceReconfigureBridge.py $(TEST_DEST)/xenserver ;\
-+ install xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py $(TEST_DEST)/xenserver ;\
-+ install -d $(TEST_DEST)/vtep ;\
-+ install vtep/vtep.ovsschema $(TEST_DEST)/vtep ;\
-+ for p in $$list ; do \
-+ echo $$p ;\
-+ p=$${p#./} ;\
-+ pre=$${p#tests\/} ;\
-+ if test $$pre != $$p ; then \
-+ echo installing $$p to $(TEST_DEST)/tests/$$pre ;\
-+ install $$p $(TEST_DEST)/tests/$$pre ;\
-+ continue ;\
-+ fi ;\
-+ pre=$${p#python\/ovs\/} ;\
-+ if test $$pre != $$p ; then \
-+ echo installing $$p to $(TEST_DEST)/python/ovs/$$pre ;\
-+ install $$p $(TEST_DEST)/python/ovs/$$pre ;\
-+ continue ;\
-+ fi; \
-+ done ;\
-+ sed -i 's|abs_builddir=.*|abs_builddir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig
-+ sed -i 's|abs_srcdir=.*|abs_srcdir='"'"'$(TEST_ROOT)/tests'"'"'|g' $(TEST_DEST)/tests/atconfig
-+ sed -i 's|abs_top_srcdir=.*|abs_top_srcdir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig
-+ sed -i 's|abs_top_builddir=.*|abs_top_builddir='"'"'$(TEST_ROOT)'"'"'|g' $(TEST_DEST)/tests/atconfig
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index 0c918cd..700a306 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -9,13 +9,13 @@ RDEPENDS_${PN}-ptest += "\
"
S = "${WORKDIR}/git"
-PV = "2.4.0+${SRCREV}"
+PV = "2.5.0+${SRCREV}"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
-SRCREV = "bb429e09f7783f1ba23ac0682ed9edf424f0cfbb"
+SRCREV = "8c0b419a0b9ac0141d6973dcc80306dfc6a83d31"
SRC_URI += "\
- git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.4 \
+ git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.5 \
file://openvswitch-add-more-target-python-substitutions.patch \
file://openvswitch-add-ptest-${SRCREV}.patch \
file://run-ptest \
@@ -23,7 +23,7 @@ SRC_URI += "\
file://kernel_module.patch \
"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5973c953e3c8a767cf0808ff8a0bac1b"
+LIC_FILES_CHKSUM = "file://COPYING;md5=247d8817aece26b21a8cd6791b3ea994"
PACKAGECONFIG ?= ""
PACKAGECONFIG[dpdk] = "--with-dpdk=${STAGING_DIR_TARGET}/opt/dpdk/${TARGET_ARCH}-native-linuxapp-gcc,,dpdk,"
--
2.0.1
More information about the meta-virtualization
mailing list