diff options
Diffstat (limited to 'net/openvswitch')
6 files changed, 1 insertions, 19 deletions
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 90ad6ffa6..46cfa5822 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 @@ -16,11 +16,9 @@ Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com> lib/netdev-linux.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -diff --git a/lib/netdev-linux.c b/lib/netdev-linux.c -index fe7fb9b29..63407ba1b 100644 --- a/lib/netdev-linux.c +++ b/lib/netdev-linux.c -@@ -3469,7 +3469,13 @@ update_flags(struct netdev_linux *netdev, enum netdev_flags off, +@@ -3469,7 +3469,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 7903afed3..2c86a3048 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 @@ -9,8 +9,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> m4/openvswitch.m4 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/Makefile.am b/Makefile.am -index 27ef9e4b4..7effb5fec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,7 +60,7 @@ endif @@ -22,8 +20,6 @@ index 27ef9e4b4..7effb5fec 100644 ALL_LOCAL = BUILT_SOURCES = -diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 -index 6fe79297e..f2e0169f8 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -383,6 +383,8 @@ else: diff --git a/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch b/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch index 363bc95fc..373c6a6d3 100644 --- a/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch +++ b/net/openvswitch/patches/0003-ovs-lib-fix-install_dir.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> utilities/ovs-lib.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in -index d646b444a..dee63dece 100644 --- a/utilities/ovs-lib.in +++ b/utilities/ovs-lib.in @@ -159,7 +159,10 @@ install_dir () { diff --git a/net/openvswitch/patches/0004-build-trim-build.patch b/net/openvswitch/patches/0004-build-trim-build.patch index 36fb946fc..19ea959ef 100644 --- a/net/openvswitch/patches/0004-build-trim-build.patch +++ b/net/openvswitch/patches/0004-build-trim-build.patch @@ -8,8 +8,6 @@ Signed-off-by: Yousong Zhou <zhouyousong@yunionyun.com> Makefile.am | 2 -- 1 file changed, 2 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 7effb5fec..d6df91e8b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -475,12 +475,10 @@ dist-docs: diff --git a/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch b/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch index 305d2a413..3993c60a2 100644 --- a/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch +++ b/net/openvswitch/patches/0006-datapath-allow-passing-additional-OVS_KERNEL_MAKE_FL.patch @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> datapath/linux/Makefile.main.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/datapath/linux/Makefile.main.in b/datapath/linux/Makefile.main.in -index 6db4aa3ab..6f295387a 100644 --- a/datapath/linux/Makefile.main.in +++ b/datapath/linux/Makefile.main.in @@ -68,7 +68,7 @@ ifeq (,$(wildcard $(CONFIG_FILE))) 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 9db7ca912..86c1d41bf 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 @@ -10,8 +10,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> m4/openvswitch.m4 | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) -diff --git a/lib/automake.mk b/lib/automake.mk -index 380a67228..610f3d940 100644 --- a/lib/automake.mk +++ b/lib/automake.mk @@ -10,6 +10,8 @@ lib_LTLIBRARIES += lib/libopenvswitch.la @@ -23,8 +21,6 @@ index 380a67228..610f3d940 100644 if WIN32 -diff --git a/lib/libopenvswitch.pc.in b/lib/libopenvswitch.pc.in -index 2a3f2ca7b..c8d02eb5a 100644 --- a/lib/libopenvswitch.pc.in +++ b/lib/libopenvswitch.pc.in @@ -7,5 +7,5 @@ Name: libopenvswitch @@ -34,8 +30,6 @@ index 2a3f2ca7b..c8d02eb5a 100644 -Libs.private: @LIBS@ +Libs.private: @LIBS@ @SSL_LIBS@ @CAPNG_LDADD@ @LIBBPF_LDADD@ @LIBUNBOUND_LDADD@ @LIBUNWIND_LDADD@ Cflags: -I${includedir}/openvswitch -diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 -index f2e0169f8..e000c1cc5 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -657,7 +657,8 @@ AC_DEFUN([OVS_CHECK_UNBOUND], |