commit: 9bf6443396a2c0cc12843670c920fc7ff7cb979b Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Mon Jun 3 14:49:48 2019 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Mon Jun 3 14:50:48 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf64433
net-misc/openvswitch: fix building on newer kernels Fixes: https://bugs.gentoo.org/687186 Package-Manager: Portage-2.3.66, Repoman-2.3.13 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> ...nntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch | 46 ++++++++++++++++++++++ ...-2.11.1.ebuild => openvswitch-2.11.1-r1.ebuild} | 5 ++- 2 files changed, 50 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..1f77ab54b0a --- /dev/null +++ b/net-misc/openvswitch/files/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch @@ -0,0 +1,46 @@ +From b89f391203c4420eb454cb321e799a64de809f52 Mon Sep 17 00:00:00 2001 +From: Yousong Zhou <[email protected]> +Date: Fri, 3 May 2019 15:03:24 +0000 +Subject: [PATCH 5/5] datapath: conntrack: fix include for + IP6_DEFRAG_CONNTRACK_IN + +The enum definition is now inside include/net/ipv6_frag.h since upstream commit +70b095c ("ipv6: remove dependency of nf_defrag_ipv6 on ipv6 module") which was +backported to stable trees (4.9, 4.14, 4.19) only these days. + +The error message + + 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 + /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': + /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 + enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; + ^~~~~~~~~~~~~~~~ + /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'? + enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; + ^~~~~~~~~~~~~~~~~~~~~~~ + IP_DEFRAG_CONNTRACK_IN + /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 + /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 + enum ip6_defrag_users user = IP6_DEFRAG_CONNTRACK_IN + zone; + ^~~~ + /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] + 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 + +Reference: https://github.com/openwrt/packages/issues/8548#issuecomment-488871090 +Signed-off-by: Yousong Zhou <[email protected]> +--- + datapath/conntrack.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/datapath/conntrack.c b/datapath/conntrack.c +index a7dc9e0c3..69bda5a9c 100644 +--- a/datapath/conntrack.c ++++ b/datapath/conntrack.c +@@ -31,6 +31,7 @@ + #include <net/netfilter/nf_conntrack_seqadj.h> + #include <net/netfilter/nf_conntrack_zones.h> + #include <net/netfilter/ipv6/nf_defrag_ipv6.h> ++#include <net/ipv6_frag.h> + + #ifdef CONFIG_NF_NAT_NEEDED + #include <linux/netfilter/nf_nat.h> diff --git a/net-misc/openvswitch/openvswitch-2.11.1.ebuild b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild similarity index 96% rename from net-misc/openvswitch/openvswitch-2.11.1.ebuild rename to net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild index a36bb2cdaa1..f2304f6ae35 100644 --- a/net-misc/openvswitch/openvswitch-2.11.1.ebuild +++ b/net-misc/openvswitch/openvswitch-2.11.1-r1.ebuild @@ -31,7 +31,10 @@ DEPEND="${RDEPEND} sys-apps/util-linux[caps] virtual/pkgconfig" -PATCHES="${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch" +PATCHES=" + ${FILESDIR}/xcp-interface-reconfigure-2.3.2.patch + ${FILESDIR}/0005-datapath-conntrack-fix-include-for-IP6_DEFRAG_CONNTR.patch +" CONFIG_CHECK="~NET_CLS_ACT ~NET_CLS_U32 ~NET_SCH_INGRESS ~NET_ACT_POLICE ~IPV6 ~TUN" MODULE_NAMES="openvswitch(net:${S}/datapath/linux)"
