* [PATCH] openvswith: Uprev to latest stable version 2.4.0
@ 2015-11-03 5:41 jianchuan.wang
2015-11-03 8:08 ` Bruce Ashfield
0 siblings, 1 reply; 6+ messages in thread
From: jianchuan.wang @ 2015-11-03 5:41 UTC (permalink / raw)
To: bruce.ashfield, meta-virtualization
From: Jianchuan Wang <jianchuan.wang@windriver.com>
Uprev to git rev bb429e09f7783f1ba23ac0682ed9edf424f0cfbb (based on 2.4.0)
- Remove openvswitch-ovsdb-automake-mkdir-ovsdb.patch since it
have been in the version 2.4.0.
Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
---
.../non_reproducible_builds_cleanup.patch | 18 ------
...-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch | 69 ----------------------
...-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch | 69 ++++++++++++++++++++++
recipes-networking/openvswitch/openvswitch_git.bb | 7 +--
4 files changed, 72 insertions(+), 91 deletions(-)
delete mode 100644 recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
delete mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
create mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
diff --git a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch b/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
deleted file mode 100644
index 999f2ea..0000000
--- a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove __DATE__, __TIME__ - error messages on non-reproducible builds
-
-Signed-off-by: Amy Fong <amy.fong@windriver.com>
----
- datapath/datapath.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/datapath/datapath.c
-+++ b/datapath/datapath.c
-@@ -2142,7 +2142,7 @@
-
- BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
-
-- pr_info("Open vSwitch switching datapath %s, built "__DATE__" "__TIME__"\n",
-+ pr_info("Open vSwitch switching datapath %s\n",
- VERSION);
-
- err = action_fifos_init();
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
deleted file mode 100644
index 76e312c..0000000
--- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Add test-install rule to support ptest execution
-
-Signed-off-by: Radu Patriu <radu.patriu@enea.com>
-
----
- Makefile.am | 2 ++
- test.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 51 insertions(+)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -369,3 +369,5 @@
- include vtep/automake.mk
- include datapath-windows/automake.mk
- include datapath-windows/include/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
new file mode 100644
index 0000000..c8ebff1
--- /dev/null
+++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
@@ -0,0 +1,69 @@
+Add test-install rule to support ptest execution
+
+Signed-off-by: Radu Patriu <radu.patriu@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 13d6165..0c918cd 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -9,19 +9,18 @@ RDEPENDS_${PN}-ptest += "\
"
S = "${WORKDIR}/git"
-PV = "2.3.90+${SRCREV}"
+PV = "2.4.0+${SRCREV}"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
-SRCREV = "1667bb34988358aaf1c92d0d21fad4b1c8698780"
+SRCREV = "bb429e09f7783f1ba23ac0682ed9edf424f0cfbb"
SRC_URI += "\
- git://github.com/openvswitch/ovs.git;protocol=git \
+ git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.4 \
file://openvswitch-add-more-target-python-substitutions.patch \
file://openvswitch-add-ptest-${SRCREV}.patch \
file://run-ptest \
file://disable_m4_check.patch \
file://kernel_module.patch \
- file://non_reproducible_builds_cleanup.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=5973c953e3c8a767cf0808ff8a0bac1b"
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] openvswith: Uprev to latest stable version 2.4.0
2015-11-03 5:41 [PATCH] openvswith: Uprev to latest stable version 2.4.0 jianchuan.wang
@ 2015-11-03 8:08 ` Bruce Ashfield
2015-11-03 9:46 ` Jianchuan Wang
0 siblings, 1 reply; 6+ messages in thread
From: Bruce Ashfield @ 2015-11-03 8:08 UTC (permalink / raw)
To: jianchuan.wang, meta-virtualization
On 11/03/2015 12:41 AM, jianchuan.wang@windriver.com wrote:
> From: Jianchuan Wang <jianchuan.wang@windriver.com>
>
> Uprev to git rev bb429e09f7783f1ba23ac0682ed9edf424f0cfbb (based on 2.4.0)
> - Remove openvswitch-ovsdb-automake-mkdir-ovsdb.patch since it
> have been in the version 2.4.0.
>
> Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
> ---
> .../non_reproducible_builds_cleanup.patch | 18 ------
You are also dropping this patch, but I don't see it explained in the
commit log.
Why is the reproducible build patch being removed ?
Bruce
> ...-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch | 69 ----------------------
> ...-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch | 69 ++++++++++++++++++++++
> recipes-networking/openvswitch/openvswitch_git.bb | 7 +--
> 4 files changed, 72 insertions(+), 91 deletions(-)
> delete mode 100644 recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
> delete mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
> create mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
>
> diff --git a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch b/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
> deleted file mode 100644
> index 999f2ea..0000000
> --- a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -Remove __DATE__, __TIME__ - error messages on non-reproducible builds
> -
> -Signed-off-by: Amy Fong <amy.fong@windriver.com>
> ----
> - datapath/datapath.c | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> ---- a/datapath/datapath.c
> -+++ b/datapath/datapath.c
> -@@ -2142,7 +2142,7 @@
> -
> - BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
> -
> -- pr_info("Open vSwitch switching datapath %s, built "__DATE__" "__TIME__"\n",
> -+ pr_info("Open vSwitch switching datapath %s\n",
> - VERSION);
> -
> - err = action_fifos_init();
> diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
> deleted file mode 100644
> index 76e312c..0000000
> --- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -Add test-install rule to support ptest execution
> -
> -Signed-off-by: Radu Patriu <radu.patriu@enea.com>
> -
> ----
> - Makefile.am | 2 ++
> - test.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
> - 2 files changed, 51 insertions(+)
> -
> ---- a/Makefile.am
> -+++ b/Makefile.am
> -@@ -369,3 +369,5 @@
> - include vtep/automake.mk
> - include datapath-windows/automake.mk
> - include datapath-windows/include/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
> new file mode 100644
> index 0000000..c8ebff1
> --- /dev/null
> +++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
> @@ -0,0 +1,69 @@
> +Add test-install rule to support ptest execution
> +
> +Signed-off-by: Radu Patriu <radu.patriu@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 13d6165..0c918cd 100644
> --- a/recipes-networking/openvswitch/openvswitch_git.bb
> +++ b/recipes-networking/openvswitch/openvswitch_git.bb
> @@ -9,19 +9,18 @@ RDEPENDS_${PN}-ptest += "\
> "
>
> S = "${WORKDIR}/git"
> -PV = "2.3.90+${SRCREV}"
> +PV = "2.4.0+${SRCREV}"
>
> FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
>
> -SRCREV = "1667bb34988358aaf1c92d0d21fad4b1c8698780"
> +SRCREV = "bb429e09f7783f1ba23ac0682ed9edf424f0cfbb"
> SRC_URI += "\
> - git://github.com/openvswitch/ovs.git;protocol=git \
> + git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.4 \
> file://openvswitch-add-more-target-python-substitutions.patch \
> file://openvswitch-add-ptest-${SRCREV}.patch \
> file://run-ptest \
> file://disable_m4_check.patch \
> file://kernel_module.patch \
> - file://non_reproducible_builds_cleanup.patch \
> "
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=5973c953e3c8a767cf0808ff8a0bac1b"
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] openvswith: Uprev to latest stable version 2.4.0
@ 2015-11-03 9:35 jianchuan.wang
2015-11-03 9:52 ` Bruce Ashfield
0 siblings, 1 reply; 6+ messages in thread
From: jianchuan.wang @ 2015-11-03 9:35 UTC (permalink / raw)
To: bruce.ashfield, meta-virtualization
From: Jianchuan Wang <jianchuan.wang@windriver.com>
Uprev to git rev bb429e09f7783f1ba23ac0682ed9edf424f0cfbb (based on 2.4.0)
- Remove non_reproducible_builds_cleanup.patch since it
have been in the version 2.4.0.
Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
---
.../non_reproducible_builds_cleanup.patch | 18 ------
...-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch | 69 ----------------------
...-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch | 69 ++++++++++++++++++++++
recipes-networking/openvswitch/openvswitch_git.bb | 7 +--
4 files changed, 72 insertions(+), 91 deletions(-)
delete mode 100644 recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
delete mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
create mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
diff --git a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch b/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
deleted file mode 100644
index 999f2ea..0000000
--- a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Remove __DATE__, __TIME__ - error messages on non-reproducible builds
-
-Signed-off-by: Amy Fong <amy.fong@windriver.com>
----
- datapath/datapath.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/datapath/datapath.c
-+++ b/datapath/datapath.c
-@@ -2142,7 +2142,7 @@
-
- BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
-
-- pr_info("Open vSwitch switching datapath %s, built "__DATE__" "__TIME__"\n",
-+ pr_info("Open vSwitch switching datapath %s\n",
- VERSION);
-
- err = action_fifos_init();
diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
deleted file mode 100644
index 76e312c..0000000
--- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Add test-install rule to support ptest execution
-
-Signed-off-by: Radu Patriu <radu.patriu@enea.com>
-
----
- Makefile.am | 2 ++
- test.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 51 insertions(+)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -369,3 +369,5 @@
- include vtep/automake.mk
- include datapath-windows/automake.mk
- include datapath-windows/include/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
new file mode 100644
index 0000000..c8ebff1
--- /dev/null
+++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
@@ -0,0 +1,69 @@
+Add test-install rule to support ptest execution
+
+Signed-off-by: Radu Patriu <radu.patriu@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 13d6165..0c918cd 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -9,19 +9,18 @@ RDEPENDS_${PN}-ptest += "\
"
S = "${WORKDIR}/git"
-PV = "2.3.90+${SRCREV}"
+PV = "2.4.0+${SRCREV}"
FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
-SRCREV = "1667bb34988358aaf1c92d0d21fad4b1c8698780"
+SRCREV = "bb429e09f7783f1ba23ac0682ed9edf424f0cfbb"
SRC_URI += "\
- git://github.com/openvswitch/ovs.git;protocol=git \
+ git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.4 \
file://openvswitch-add-more-target-python-substitutions.patch \
file://openvswitch-add-ptest-${SRCREV}.patch \
file://run-ptest \
file://disable_m4_check.patch \
file://kernel_module.patch \
- file://non_reproducible_builds_cleanup.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=5973c953e3c8a767cf0808ff8a0bac1b"
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] openvswith: Uprev to latest stable version 2.4.0
2015-11-03 8:08 ` Bruce Ashfield
@ 2015-11-03 9:46 ` Jianchuan Wang
2015-11-03 9:50 ` Bruce Ashfield
0 siblings, 1 reply; 6+ messages in thread
From: Jianchuan Wang @ 2015-11-03 9:46 UTC (permalink / raw)
To: Bruce Ashfield, meta-virtualization
On 11/03/2015 04:08 PM, Bruce Ashfield wrote:
> On 11/03/2015 12:41 AM, jianchuan.wang@windriver.com wrote:
>> From: Jianchuan Wang <jianchuan.wang@windriver.com>
>>
>> Uprev to git rev bb429e09f7783f1ba23ac0682ed9edf424f0cfbb (based on
>> 2.4.0)
>> - Remove openvswitch-ovsdb-automake-mkdir-ovsdb.patch since it
>> have been in the version 2.4.0.
>>
>> Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
>> ---
>> .../non_reproducible_builds_cleanup.patch | 18 ------
>
> You are also dropping this patch, but I don't see it explained in the
> commit log.
>
> Why is the reproducible build patch being removed ?
>
I am sorry for that.
It should replace openvswitch-ovsdb-automake-mkdir-ovsdb.patch into
non_reproducible_builds_cleanup.patch in commit log.
Do I need re-send it ?
Jianchuan
> Bruce
>
>> ...-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch | 69
>> ----------------------
>> ...-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch | 69
>> ++++++++++++++++++++++
>> recipes-networking/openvswitch/openvswitch_git.bb | 7 +--
>> 4 files changed, 72 insertions(+), 91 deletions(-)
>> delete mode 100644
>> recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
>> delete mode 100644
>> recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
>> create mode 100644
>> recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
>>
>> diff --git
>> a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
>> b/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
>>
>> deleted file mode 100644
>> index 999f2ea..0000000
>> ---
>> a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
>> +++ /dev/null
>> @@ -1,18 +0,0 @@
>> -Remove __DATE__, __TIME__ - error messages on non-reproducible builds
>> -
>> -Signed-off-by: Amy Fong <amy.fong@windriver.com>
>> ----
>> - datapath/datapath.c | 2 +-
>> - 1 files changed, 1 insertions(+), 1 deletions(-)
>> -
>> ---- a/datapath/datapath.c
>> -+++ b/datapath/datapath.c
>> -@@ -2142,7 +2142,7 @@
>> -
>> - BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct
>> sk_buff, cb));
>> -
>> -- pr_info("Open vSwitch switching datapath %s, built "__DATE__"
>> "__TIME__"\n",
>> -+ pr_info("Open vSwitch switching datapath %s\n",
>> - VERSION);
>> -
>> - err = action_fifos_init();
>> diff --git
>> a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
>> b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
>>
>> deleted file mode 100644
>> index 76e312c..0000000
>> ---
>> a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
>> +++ /dev/null
>> @@ -1,69 +0,0 @@
>> -Add test-install rule to support ptest execution
>> -
>> -Signed-off-by: Radu Patriu <radu.patriu@enea.com>
>> -
>> ----
>> - Makefile.am | 2 ++
>> - test.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
>> - 2 files changed, 51 insertions(+)
>> -
>> ---- a/Makefile.am
>> -+++ b/Makefile.am
>> -@@ -369,3 +369,5 @@
>> - include vtep/automake.mk
>> - include datapath-windows/automake.mk
>> - include datapath-windows/include/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
>>
>> new file mode 100644
>> index 0000000..c8ebff1
>> --- /dev/null
>> +++
>> b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
>> @@ -0,0 +1,69 @@
>> +Add test-install rule to support ptest execution
>> +
>> +Signed-off-by: Radu Patriu <radu.patriu@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 13d6165..0c918cd 100644
>> --- a/recipes-networking/openvswitch/openvswitch_git.bb
>> +++ b/recipes-networking/openvswitch/openvswitch_git.bb
>> @@ -9,19 +9,18 @@ RDEPENDS_${PN}-ptest += "\
>> "
>>
>> S = "${WORKDIR}/git"
>> -PV = "2.3.90+${SRCREV}"
>> +PV = "2.4.0+${SRCREV}"
>>
>> FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
>>
>> -SRCREV = "1667bb34988358aaf1c92d0d21fad4b1c8698780"
>> +SRCREV = "bb429e09f7783f1ba23ac0682ed9edf424f0cfbb"
>> SRC_URI += "\
>> - git://github.com/openvswitch/ovs.git;protocol=git \
>> + git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.4 \
>> file://openvswitch-add-more-target-python-substitutions.patch \
>> file://openvswitch-add-ptest-${SRCREV}.patch \
>> file://run-ptest \
>> file://disable_m4_check.patch \
>> file://kernel_module.patch \
>> - file://non_reproducible_builds_cleanup.patch \
>> "
>>
>> LIC_FILES_CHKSUM =
>> "file://COPYING;md5=5973c953e3c8a767cf0808ff8a0bac1b"
>>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] openvswith: Uprev to latest stable version 2.4.0
2015-11-03 9:46 ` Jianchuan Wang
@ 2015-11-03 9:50 ` Bruce Ashfield
0 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2015-11-03 9:50 UTC (permalink / raw)
To: Jianchuan Wang, meta-virtualization
On 11/03/2015 04:46 AM, Jianchuan Wang wrote:
>
>
> On 11/03/2015 04:08 PM, Bruce Ashfield wrote:
>> On 11/03/2015 12:41 AM, jianchuan.wang@windriver.com wrote:
>>> From: Jianchuan Wang <jianchuan.wang@windriver.com>
>>>
>>> Uprev to git rev bb429e09f7783f1ba23ac0682ed9edf424f0cfbb (based on
>>> 2.4.0)
>>> - Remove openvswitch-ovsdb-automake-mkdir-ovsdb.patch since it
>>> have been in the version 2.4.0.
>>>
>>> Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
>>> ---
>>> .../non_reproducible_builds_cleanup.patch | 18 ------
>>
>> You are also dropping this patch, but I don't see it explained in the
>> commit log.
>>
>> Why is the reproducible build patch being removed ?
>>
>
> I am sorry for that.
>
> It should replace openvswitch-ovsdb-automake-mkdir-ovsdb.patch into
> non_reproducible_builds_cleanup.patch in commit log.
>
> Do I need re-send it ?
I'd prefer a v2, since I don't think I'm following your description and
a v2 should make it clear :) (I'm not seeing how the changes in the patch
that are being removed are replaced by the update, or by another patch).
Bruce
>
> Jianchuan
>
>> Bruce
>>
>>> ...-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch | 69
>>> ----------------------
>>> ...-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch | 69
>>> ++++++++++++++++++++++
>>> recipes-networking/openvswitch/openvswitch_git.bb | 7 +--
>>> 4 files changed, 72 insertions(+), 91 deletions(-)
>>> delete mode 100644
>>> recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
>>>
>>> delete mode 100644
>>> recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
>>>
>>> create mode 100644
>>> recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
>>>
>>>
>>> diff --git
>>> a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
>>> b/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
>>>
>>> deleted file mode 100644
>>> index 999f2ea..0000000
>>> ---
>>> a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
>>>
>>> +++ /dev/null
>>> @@ -1,18 +0,0 @@
>>> -Remove __DATE__, __TIME__ - error messages on non-reproducible builds
>>> -
>>> -Signed-off-by: Amy Fong <amy.fong@windriver.com>
>>> ----
>>> - datapath/datapath.c | 2 +-
>>> - 1 files changed, 1 insertions(+), 1 deletions(-)
>>> -
>>> ---- a/datapath/datapath.c
>>> -+++ b/datapath/datapath.c
>>> -@@ -2142,7 +2142,7 @@
>>> -
>>> - BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct
>>> sk_buff, cb));
>>> -
>>> -- pr_info("Open vSwitch switching datapath %s, built "__DATE__"
>>> "__TIME__"\n",
>>> -+ pr_info("Open vSwitch switching datapath %s\n",
>>> - VERSION);
>>> -
>>> - err = action_fifos_init();
>>> diff --git
>>> a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
>>> b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
>>>
>>> deleted file mode 100644
>>> index 76e312c..0000000
>>> ---
>>> a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
>>>
>>> +++ /dev/null
>>> @@ -1,69 +0,0 @@
>>> -Add test-install rule to support ptest execution
>>> -
>>> -Signed-off-by: Radu Patriu <radu.patriu@enea.com>
>>> -
>>> ----
>>> - Makefile.am | 2 ++
>>> - test.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
>>> - 2 files changed, 51 insertions(+)
>>> -
>>> ---- a/Makefile.am
>>> -+++ b/Makefile.am
>>> -@@ -369,3 +369,5 @@
>>> - include vtep/automake.mk
>>> - include datapath-windows/automake.mk
>>> - include datapath-windows/include/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
>>>
>>> new file mode 100644
>>> index 0000000..c8ebff1
>>> --- /dev/null
>>> +++
>>> b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
>>>
>>> @@ -0,0 +1,69 @@
>>> +Add test-install rule to support ptest execution
>>> +
>>> +Signed-off-by: Radu Patriu <radu.patriu@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 13d6165..0c918cd 100644
>>> --- a/recipes-networking/openvswitch/openvswitch_git.bb
>>> +++ b/recipes-networking/openvswitch/openvswitch_git.bb
>>> @@ -9,19 +9,18 @@ RDEPENDS_${PN}-ptest += "\
>>> "
>>>
>>> S = "${WORKDIR}/git"
>>> -PV = "2.3.90+${SRCREV}"
>>> +PV = "2.4.0+${SRCREV}"
>>>
>>> FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
>>>
>>> -SRCREV = "1667bb34988358aaf1c92d0d21fad4b1c8698780"
>>> +SRCREV = "bb429e09f7783f1ba23ac0682ed9edf424f0cfbb"
>>> SRC_URI += "\
>>> - git://github.com/openvswitch/ovs.git;protocol=git \
>>> + git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.4 \
>>> file://openvswitch-add-more-target-python-substitutions.patch \
>>> file://openvswitch-add-ptest-${SRCREV}.patch \
>>> file://run-ptest \
>>> file://disable_m4_check.patch \
>>> file://kernel_module.patch \
>>> - file://non_reproducible_builds_cleanup.patch \
>>> "
>>>
>>> LIC_FILES_CHKSUM =
>>> "file://COPYING;md5=5973c953e3c8a767cf0808ff8a0bac1b"
>>>
>>
>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] openvswith: Uprev to latest stable version 2.4.0
2015-11-03 9:35 jianchuan.wang
@ 2015-11-03 9:52 ` Bruce Ashfield
0 siblings, 0 replies; 6+ messages in thread
From: Bruce Ashfield @ 2015-11-03 9:52 UTC (permalink / raw)
To: jianchuan.wang, meta-virtualization
There was a typo in the short log (openvswith), but I fixed that during
my merge, and I've pushed the change.
Thanks!
Bruce
On 11/03/2015 04:35 AM, jianchuan.wang@windriver.com wrote:
> From: Jianchuan Wang <jianchuan.wang@windriver.com>
>
> Uprev to git rev bb429e09f7783f1ba23ac0682ed9edf424f0cfbb (based on 2.4.0)
> - Remove non_reproducible_builds_cleanup.patch since it
> have been in the version 2.4.0.
>
> Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com>
> ---
> .../non_reproducible_builds_cleanup.patch | 18 ------
> ...-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch | 69 ----------------------
> ...-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch | 69 ++++++++++++++++++++++
> recipes-networking/openvswitch/openvswitch_git.bb | 7 +--
> 4 files changed, 72 insertions(+), 91 deletions(-)
> delete mode 100644 recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
> delete mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
> create mode 100644 recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
>
> diff --git a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch b/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
> deleted file mode 100644
> index 999f2ea..0000000
> --- a/recipes-networking/openvswitch/openvswitch-git/non_reproducible_builds_cleanup.patch
> +++ /dev/null
> @@ -1,18 +0,0 @@
> -Remove __DATE__, __TIME__ - error messages on non-reproducible builds
> -
> -Signed-off-by: Amy Fong <amy.fong@windriver.com>
> ----
> - datapath/datapath.c | 2 +-
> - 1 files changed, 1 insertions(+), 1 deletions(-)
> -
> ---- a/datapath/datapath.c
> -+++ b/datapath/datapath.c
> -@@ -2142,7 +2142,7 @@
> -
> - BUILD_BUG_ON(sizeof(struct ovs_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb));
> -
> -- pr_info("Open vSwitch switching datapath %s, built "__DATE__" "__TIME__"\n",
> -+ pr_info("Open vSwitch switching datapath %s\n",
> - VERSION);
> -
> - err = action_fifos_init();
> diff --git a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
> deleted file mode 100644
> index 76e312c..0000000
> --- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
> +++ /dev/null
> @@ -1,69 +0,0 @@
> -Add test-install rule to support ptest execution
> -
> -Signed-off-by: Radu Patriu <radu.patriu@enea.com>
> -
> ----
> - Makefile.am | 2 ++
> - test.mk | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
> - 2 files changed, 51 insertions(+)
> -
> ---- a/Makefile.am
> -+++ b/Makefile.am
> -@@ -369,3 +369,5 @@
> - include vtep/automake.mk
> - include datapath-windows/automake.mk
> - include datapath-windows/include/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
> new file mode 100644
> index 0000000..c8ebff1
> --- /dev/null
> +++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
> @@ -0,0 +1,69 @@
> +Add test-install rule to support ptest execution
> +
> +Signed-off-by: Radu Patriu <radu.patriu@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 13d6165..0c918cd 100644
> --- a/recipes-networking/openvswitch/openvswitch_git.bb
> +++ b/recipes-networking/openvswitch/openvswitch_git.bb
> @@ -9,19 +9,18 @@ RDEPENDS_${PN}-ptest += "\
> "
>
> S = "${WORKDIR}/git"
> -PV = "2.3.90+${SRCREV}"
> +PV = "2.4.0+${SRCREV}"
>
> FILESEXTRAPATHS_append := "${THISDIR}/${PN}-git:"
>
> -SRCREV = "1667bb34988358aaf1c92d0d21fad4b1c8698780"
> +SRCREV = "bb429e09f7783f1ba23ac0682ed9edf424f0cfbb"
> SRC_URI += "\
> - git://github.com/openvswitch/ovs.git;protocol=git \
> + git://github.com/openvswitch/ovs.git;protocol=git;branch=branch-2.4 \
> file://openvswitch-add-more-target-python-substitutions.patch \
> file://openvswitch-add-ptest-${SRCREV}.patch \
> file://run-ptest \
> file://disable_m4_check.patch \
> file://kernel_module.patch \
> - file://non_reproducible_builds_cleanup.patch \
> "
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=5973c953e3c8a767cf0808ff8a0bac1b"
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-11-03 9:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-03 5:41 [PATCH] openvswith: Uprev to latest stable version 2.4.0 jianchuan.wang
2015-11-03 8:08 ` Bruce Ashfield
2015-11-03 9:46 ` Jianchuan Wang
2015-11-03 9:50 ` Bruce Ashfield
-- strict thread matches above, loose matches on Subject: below --
2015-11-03 9:35 jianchuan.wang
2015-11-03 9:52 ` Bruce Ashfield
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.