4 files changed, 9 insertions, 43 deletions

diff --git a/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch b/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch
index 711a1487..ce1f6501 100644
--- a/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch
+++ b/recipes-networking/openvswitch/openvswitch-git/disable_m4_check.patch
@@ -9,11 +9,11 @@ Signed-off-by: Amy Fong <amy.fong@windriver.com>
  Makefile.am | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index ff7d70a..2fc1f13 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -187,7 +187,7 @@ CLEAN_LOCAL += clean-pycov
+Index: git/Makefile.am
+===================================================================
+--- git.orig/Makefile.am
++++ git/Makefile.am
+@@ -194,7 +194,7 @@
  
  # If we're checked out from a Git repository, make sure that every
  # file that is in Git is distributed.
@@ -21,4 +21,4 @@ index ff7d70a..2fc1f13 100644
 +# ALL_LOCAL += dist-hook-git
  dist-hook-git: distfiles
         @if test -e $(srcdir)/.git && (git --version) >/dev/null 2>&1; then \
-          (cd datapath && $(MAKE) distfiles); \
+          (cd $(srcdir) && git ls-files) | grep -v '\.gitignore$$' | \
diff --git a/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch b/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch
deleted file mode 100644
index 5e5a38d9..00000000
--- a/recipes-networking/openvswitch/openvswitch-git/kernel_module.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9b7fb1346702d59af67435487254ef35940bc16a Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song" <hongzhi.song@windriver.com>
-Date: Wed, 23 Jan 2019 03:41:30 -0500
-Subject: [PATCH] datapatch/linux: Specify install path for kernel module
-
-Signed-off-by: Amy Fong <amy.fong@windriver.com>
-Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
----
- datapath/linux/Makefile.main.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in
-index 328bbfb..6dcc8d0 100644
---- a/datapath/linux/Makefile.main.in
-+++ b/datapath/linux/Makefile.main.in
-@@ -71,8 +71,8 @@ default:
-        $(MAKE) -C $(KSRC) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules
- 
- modules_install:
--       $(MAKE) -C $(KSRC) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules_install
--       /sbin/depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h`
-+       $(MAKE) -C $(KSRC) $(if @KARCH@,ARCH=@KARCH@) M=$(builddir) modules_install INSTALL_MOD_PATH=${INSTALL_MOD_PATH}
-+       #/sbin/depmod `sed -n 's/#define UTS_RELEASE "\([^"]*\)"/\1/p' $(KSRC)/include/generated/utsrelease.h`
- endif
- 
- # Much of the kernel build system in this file is derived from Intel's
--- 
-2.8.1
-
diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc
index e6c9091a..767a41e6 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -132,7 +132,6 @@ do_install:append() {
         install -d ${D}/usr/share/openvswitch/scripts/
         install -m 755 ${S}/rhel/usr_share_openvswitch_scripts_ovs-systemd-reload ${D}/usr/share/openvswitch/scripts/ovs-systemd-reload
 
-        oe_runmake modules_install INSTALL_MOD_PATH=${D}${root_prefix}
         install -d ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages
         cp -r ${S}/python/ovstest/ ${D}${libdir}/python${PYTHON_BASEVERSION}/site-packages/
 }
diff --git a/recipes-networking/openvswitch/openvswitch_git.bb b/recipes-networking/openvswitch/openvswitch_git.bb
index f5d85f3f..925444e0 100644
--- a/recipes-networking/openvswitch/openvswitch_git.bb
+++ b/recipes-networking/openvswitch/openvswitch_git.bb
@@ -14,17 +14,16 @@ RDEPENDS:${PN}-ptest += "\
         "
 
 S = "${WORKDIR}/git"
-PV = "2.17.1+${SRCPV}"
+PV = "3.0.3+${SRCPV}"
 CVE_VERSION = "2.17.1"
 
 FILESEXTRAPATHS:append := "${THISDIR}/${PN}-git:"
 
-SRCREV = "41bb202fb37f184b0a8820a029c62d03c118614e"
-SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-2.17 \
+SRCREV = "7b5c4240c1ed5f38e476cf08819869dc14f55e8a"
+SRC_URI += "git://github.com/openvswitch/ovs.git;protocol=https;branch=branch-3.0 \
             file://openvswitch-add-ptest-71d553b995d0bd527d3ab1e9fbaf5a2ae34de2f3.patch \
             file://run-ptest \
             file://disable_m4_check.patch \
-            file://kernel_module.patch \
             file://systemd-update-tool-paths.patch \
             file://systemd-create-runtime-dirs.patch \
            "
@@ -52,6 +51,3 @@ do_install_ptest() {
         oe_runmake test-install
 }
 
-do_install:append() {
-        oe_runmake modules_install INSTALL_MOD_PATH=${D}${root_prefix}
-}