| 1 |
commit: 9bf6443396a2c0cc12843670c920fc7ff7cb979b |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 3 14:49:48 2019 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 3 14:50:48 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf64433 |
| 7 |
|
| 8 |
net-misc/openvswitch: fix building on newer kernels |
| 9 |
|
| 10 |
Fixes: https://bugs.gentoo.org/687186 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.66, Repoman-2.3.13 |
| 13 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 14 |
|
| 15 |
...nntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch | 46 ++++++++++++++++++++++ |
| 16 |
...-2.11.1.ebuild => openvswitch-2.11.1-r1.ebuild} | 5 ++- |
| 17 |
2 files changed, 50 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..1f77ab54b0a |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch |
| 24 |
@@ -0,0 +1,46 @@ |
| 25 |
+From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001 |
| 26 |
+From: Yousong Zhou <zhouyousong@×××××××××.com> |
| 27 |
+Date: Fri, 3 May 2019 15:03:24 +0000 |
| 28 |
+Subject: [PATCH 5/5] datapath: conntrack: fix include for |
| 29 |
+ IP6_DEFRAG_CONNTRACK_IN |
| 30 |
+ |
| 31 |
+The enum definition is now inside include/net/ipv6_frag.h since upstream commit |
| 32 |
+70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was |
| 33 |
+backported to stable trees (4.9, 4.14, 4.19) only these days. |
| 34 |
+ |
| 35 |
+The error message |
| 36 |
+ |
| 37 |
+ CC [M] /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o |
| 38 |
+ /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c: In function 'handle_fragments': |
| 39 |
+ /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:8: error: variable 'user' has initializer but incomplete type |
| 40 |
+ enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; |
| 41 |
+ ^~~~~~~~~~~~~~~~ |
| 42 |
+ /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: error: 'IP6_DEFRAG_CONNTRACK_IN' undeclared (first use in this function); did you mean 'IP_DEFRAG_CONNTRACK_IN'? |
| 43 |
+ enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; |
| 44 |
+ ^~~~~~~~~~~~~~~~~~~~~~~ |
| 45 |
+ IP_DEFRAG_CONNTRACK_IN |
| 46 |
+ /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:32: note: each undeclared identifier is reported only once for each function it appears in |
| 47 |
+ /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: error: storage size of 'user' isn't known |
| 48 |
+ enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; |
| 49 |
+ ^~~~ |
| 50 |
+ /opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.c:554:25: warning: unused variable 'user' [-Wunused-variable] |
| 51 |
+ scripts/Makefile.build:326: recipe for target '/opt/buildbot/slaves/lede-slave-tah/mipsel_24kc/build/sdk/build_dir/target-mipsel_24kc_musl/linux-ramips_mt7620/openvswitch-2.11.0/datapath/linux/conntrack.o' failed |
| 52 |
+ |
| 53 |
+Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090 |
| 54 |
+Signed-off-by: Yousong Zhou <zhouyousong@×××××××××.com> |
| 55 |
+--- |
| 56 |
+ datapath/conntrack.c | 1 + |
| 57 |
+ 1 file changed, 1 insertion(+) |
| 58 |
+ |
| 59 |
+diff --git a/datapath/conntrack.c b/datapath/conntrack.c |
| 60 |
+index a7dc9e0c3..69bda5a9c 100644 |
| 61 |
+--- a/datapath/conntrack.c |
| 62 |
++++ b/datapath/conntrack.c |
| 63 |
+@@ -31,6 +31,7 @@ |
| 64 |
+ #include <net/netfilter/nf_conntrack_seqadj.h> |
| 65 |
+ #include <net/netfilter/nf_conntrack_zones.h> |
| 66 |
+ #include <net/netfilter/ipv6/nf_defrag_ipv6.h> |
| 67 |
++#include <net/ipv6_frag.h> |
| 68 |
+ |
| 69 |
+ #ifdef CONFIG_NF_NAT_NEEDED |
| 70 |
+ #include <linux/netfilter/nf_nat.h> |
| 71 |
|
| 72 |
diff --git a/net-misc/openvswitch/openvswitch-2.11.1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild |
| 73 |
similarity index 96% |
| 74 |
rename from net-misc/openvswitch/openvswitch-2.11.1.ebuild |
| 75 |
rename to net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild |
| 76 |
index a36bb2cdaa1..f2304f6ae35 100644 |
| 77 |
--- a/net-misc/openvswitch/openvswitch-2.11.1.ebuild |
| 78 |
+++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild |
| 79 |
@@ -31,7 +31,10 @@ DEPEND="${RDEPEND} |
| 80 |
sys-apps/util-linux[caps] |
| 81 |
virtual/pkgconfig" |
| 82 |
|
| 83 |
-PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" |
| 84 |
+PATCHES=" |
| 85 |
+ ${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch |
| 86 |
+ ${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch |
| 87 |
+" |
| 88 |
|
| 89 |
CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" |
| 90 |
MODULE_NAMES="openvswitch(net:${S}/datapath/linux)" |
Archives