* Building ipset-6.24 on CentOS7 fails
@ 2014-12-16 19:18 Ricardo Klein
2014-12-16 22:34 ` Daniel Borkmann
2014-12-17 7:58 ` Jozsef Kadlecsik
0 siblings, 2 replies; 3+ messages in thread
From: Ricardo Klein @ 2014-12-16 19:18 UTC (permalink / raw)
To: netfilter-devel
Trying to build ipset 6.24 on CentOS7 fails... Here is the error:
http://pastebin.com/LDMvs0rv
**ipset-6.23 works.
--
Att...
Ricardo Felipe Klein
klein.rfk@gmail.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Building ipset-6.24 on CentOS7 fails
2014-12-16 19:18 Building ipset-6.24 on CentOS7 fails Ricardo Klein
@ 2014-12-16 22:34 ` Daniel Borkmann
2014-12-17 7:58 ` Jozsef Kadlecsik
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2014-12-16 22:34 UTC (permalink / raw)
To: Ricardo Klein; +Cc: netfilter-devel
On 12/16/2014 08:18 PM, Ricardo Klein wrote:
> Trying to build ipset 6.24 on CentOS7 fails... Here is the error:
> http://pastebin.com/LDMvs0rv
>
> **ipset-6.23 works.
That's because CentOS7 is missing commit:
commit 93be3c2eb3371f022ad88acf1ab6bee8e3c38378
Author: Oleg Nesterov <oleg@redhat.com>
Date: Tue Nov 12 15:10:03 2013 -0800
list: introduce list_last_entry(), use list_{first,last}_entry()
You could work around that by manually adding this to your kernel
source in order to build that.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Building ipset-6.24 on CentOS7 fails
2014-12-16 19:18 Building ipset-6.24 on CentOS7 fails Ricardo Klein
2014-12-16 22:34 ` Daniel Borkmann
@ 2014-12-17 7:58 ` Jozsef Kadlecsik
1 sibling, 0 replies; 3+ messages in thread
From: Jozsef Kadlecsik @ 2014-12-17 7:58 UTC (permalink / raw)
To: Ricardo Klein; +Cc: netfilter-devel
On Tue, 16 Dec 2014, Ricardo Klein wrote:
> Trying to build ipset 6.24 on CentOS7 fails... Here is the error:
> http://pastebin.com/LDMvs0rv
Please try the next patch: is it sufficient on CentOS7?
diff --git a/configure.ac b/configure.ac
index 4212274..74bc7de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -376,6 +376,16 @@ else
AC_SUBST(HAVE_TCF_EMATCH_STRUCT_NET, undef)
fi
+AC_MSG_CHECKING([kernel source for list_last_entry])
+if test -f $ksourcedir/include/linux/list.h && \
+ $GREP -q 'list_last_entry' $ksourcedir/include/linux/list.h; then
+ AC_MSG_RESULT(yes)
+ AC_SUBST(HAVE_LIST_LAST_ENTRY, define)
+else
+ AC_MSG_RESULT(no)
+ AC_SUBST(HAVE_LIST_LAST_ENTRY, undef)
+fi
+
AC_MSG_CHECKING([kernel source for struct net_generic])
if test -f $ksourcedir/include/net/netns/generic.h && \
$GREP -q 'struct net_generic' $ksourcedir/include/net/netns/generic.h; then
diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
index 375a18a..c33de44 100644
--- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
+++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h.in
@@ -40,6 +40,7 @@
#@HAVE_XT_MTCHK_PARAM_STRUCT_NET@ HAVE_XT_MTCHK_PARAM_STRUCT_NET
#@HAVE_TCF_EMATCH_OPS_CHANGE_ARG_NET@ HAVE_TCF_EMATCH_OPS_CHANGE_ARG_NET
#@HAVE_TCF_EMATCH_STRUCT_NET@ HAVE_TCF_EMATCH_STRUCT_NET
+#@HAVE_LIST_LAST_ENTRY@ HAVE_LIST_LAST_ENTRY
/* Not everything could be moved here. Compatibility stuffs can be found in
* xt_set.c, ip_set_core.c, ip_set_getport.c, pfxlen.c too.
@@ -164,4 +165,9 @@ static inline int nla_put_net32(struct sk_buff *skb, int attrtype, __be32 value)
}
#endif
+#ifndef HAVE_LIST_LAST_ENTRY
+#define list_last_entry(ptr, type, member) \
+ list_entry((ptr)->prev, type, member)
+#endif
+
#endif /* __IP_SET_COMPAT_H */
Best regards,
Jozse
-
E-mail : kadlec@blackhole.kfki.hu, kadlecsik.jozsef@wigner.mta.hu
PGP key : http://www.kfki.hu/~kadlec/pgp_public_key.txt
Address : Wigner Research Centre for Physics, Hungarian Academy of Sciences
H-1525 Budapest 114, POB. 49, Hungary
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-12-17 7:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-16 19:18 Building ipset-6.24 on CentOS7 fails Ricardo Klein
2014-12-16 22:34 ` Daniel Borkmann
2014-12-17 7:58 ` Jozsef Kadlecsik
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.