openvswitch: Uprev to latest stable version 2.4.0

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>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 5 insertions, 24 deletions

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 999f2ea7..00000000
--- 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-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
index 76e312ca..c8ebff14 100644
--- a/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-1667bb34988358aaf1c92d0d21fad4b1c8698780.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/openvswitch-add-ptest-bb429e09f7783f1ba23ac0682ed9edf424f0cfbb.patch
@@ -9,10 +9,10 @@ Signed-off-by: Radu Patriu <radu.patriu@enea.com>
 
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -369,3 +369,5 @@
- include vtep/automake.mk
+@@ -382,3 +382,5 @@
  include datapath-windows/automake.mk
  include datapath-windows/include/automake.mk
+ include windows/automake.mk
 +include test.mk
 +
 --- /dev/null
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index 13d61655..0c918cd9 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"