diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2021-07-21 08:53:29 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2021-07-23 12:16:29 +0300 |
| commit | 261961a33cc0c36d318d0b38a86a57a655aea1ca (patch) | |
| tree | 1350dca79ed46669b16066800c82c9cf9a2ea9d0 /net/openvswitch/patches | |
| parent | 743aafbeda5622b1e79d6207c32481976fd33d8f (diff) | |
openvswitch: refresh patches
CI run fails due to dirty patches, so refresh them.
Fixes: f4f1a25e80f5 ("openvswitch: bump to version 2.15.0")
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'net/openvswitch/patches')
3 files changed, 4 insertions, 4 deletions
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 2c86a3048..434b56e67 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 <yszhou4tech@gmail.com> BUILT_SOURCES = --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 -@@ -383,6 +383,8 @@ else: +@@ -372,6 +372,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/0004-build-trim-build.patch b/net/openvswitch/patches/0004-build-trim-build.patch index 19ea959ef..3e0eca515 100644 --- a/net/openvswitch/patches/0004-build-trim-build.patch +++ b/net/openvswitch/patches/0004-build-trim-build.patch @@ -10,7 +10,7 @@ Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com> --- a/Makefile.am +++ b/Makefile.am -@@ -475,12 +475,10 @@ dist-docs: +@@ -477,12 +477,10 @@ dist-docs: VERSION=$(VERSION) MAKE='$(MAKE)' $(srcdir)/build-aux/dist-docs $(srcdir) $(docs) .PHONY: dist-docs 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 86c1d41bf..1491af51d 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 <yszhou4tech@gmail.com> Cflags: -I${includedir}/openvswitch --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 -@@ -657,7 +657,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND], +@@ -646,7 +646,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 <yszhou4tech@gmail.com> fi AM_CONDITIONAL([HAVE_UNBOUND], [test "$HAVE_UNBOUND" = yes]) AC_SUBST([HAVE_UNBOUND])]) -@@ -669,7 +670,8 @@ AC_DEFUN([OVS_CHECK_UNWIND], +@@ -658,7 +659,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.]) |