From b1b37995e1dcd88e41bfc802943ebe4d701a7276 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 23 Mar 2022 06:47:41 +0000 Subject: [PATCH] openvswitch: bump to version 2.17.0 Signed-off-by: Yousong Zhou --- net/openvswitch/Makefile | 2 +- net/openvswitch/openvswitch.mk | 2 +- ...netdev-linux-Let-interface-flag-survive-internal-por.patch | 2 +- ...python-separate-host-target-python-for-cross-compile.patch | 2 +- ...build-only-link-libopenvswitch-with-libunwind-libunb.patch | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index e6a23aadc4..a10fb8572d 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -20,7 +20,7 @@ PKG_VERSION:=$(ovs_version) PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.openvswitch.org/releases/ -PKG_HASH:=015e77a520c380b080b3fb5a4c73e34ef40c08aa05d7049c73719db75b6adc79 +PKG_HASH:=e03bfab7ca82d81a7d3a36de4f390a3b5210e3f39657671f922877cd4ea6dc73 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/net/openvswitch/openvswitch.mk b/net/openvswitch/openvswitch.mk index dd57c6369c..c3e6176e03 100644 --- a/net/openvswitch/openvswitch.mk +++ b/net/openvswitch/openvswitch.mk @@ -5,7 +5,7 @@ # Versions -ovs_version:=2.15.3 +ovs_version:=2.17.0 ovs_builddir=$(KERNEL_BUILD_DIR)/openvswitch-$(ovs_version) # Shared vars, macros diff --git a/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch b/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch index 6a22077a25..80b11dc07e 100644 --- a/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch +++ b/net/openvswitch/patches/0001-netdev-linux-Let-interface-flag-survive-internal-por.patch @@ -18,7 +18,7 @@ Signed-off-by: Helmut Schaa --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c -@@ -3485,7 +3485,13 @@ update_flags(struct netdev_linux *netdev +@@ -3546,7 +3546,13 @@ update_flags(struct netdev_linux *netdev unsigned int old_flags, new_flags; int error = 0; diff --git a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch index 434b56e670..e44b6466d2 100644 --- a/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch +++ b/net/openvswitch/patches/0002-python-separate-host-target-python-for-cross-compile.patch @@ -22,7 +22,7 @@ Signed-off-by: Yousong Zhou BUILT_SOURCES = --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 -@@ -372,6 +372,8 @@ else: +@@ -400,6 +400,8 @@ else: AC_MSG_ERROR([Python 3.4 or later is required but not found in $PATH, please install it or set $PYTHON3 to point to it]) fi AC_ARG_VAR([PYTHON3]) diff --git a/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch b/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch index 1491af51d5..d37733223e 100644 --- a/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch +++ b/net/openvswitch/patches/0007-build-only-link-libopenvswitch-with-libunwind-libunb.patch @@ -32,7 +32,7 @@ Signed-off-by: Yousong Zhou Cflags: -I${includedir}/openvswitch --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 -@@ -646,7 +646,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND], +@@ -677,7 +677,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND], [AC_CHECK_LIB(unbound, ub_ctx_create, [HAVE_UNBOUND=yes], [HAVE_UNBOUND=no]) if test "$HAVE_UNBOUND" = yes; then AC_DEFINE([HAVE_UNBOUND], [1], [Define to 1 if unbound is detected.]) @@ -42,7 +42,7 @@ Signed-off-by: Yousong Zhou fi AM_CONDITIONAL([HAVE_UNBOUND], [test "$HAVE_UNBOUND" = yes]) AC_SUBST([HAVE_UNBOUND])]) -@@ -658,7 +659,8 @@ AC_DEFUN([OVS_CHECK_UNWIND], +@@ -689,7 +690,8 @@ AC_DEFUN([OVS_CHECK_UNWIND], [HAVE_UNWIND=no]) if test "$HAVE_UNWIND" = yes; then AC_DEFINE([HAVE_UNWIND], [1], [Define to 1 if unwind is detected.]) -- 2.30.2