[Buildroot] [git commit] ipset: ensure target kernel headers are used

[Buildroot] [git commit] ipset: ensure target kernel headers are used

[Peter Korsgaard]

commit: http://git.buildroot.net/buildroot/commit/?id=ca99c04d2676ba66b670b0eb17ed5fe5d37db4e2
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

ipsets configure script checks the kernel headers to ensure the kernel
is new enough / has patch applied, and errors out if this is not so.

Ensure that the target kernel headers are searched, rather than
what is available on the build host.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
---
 package/ipset/ipset.mk |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
index 9d901fc..700d2bc 100644
--- a/package/ipset/ipset.mk
+++ b/package/ipset/ipset.mk
@@ -9,5 +9,6 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 IPSET_SITE = http://ipset.netfilter.org
 IPSET_AUTORECONF = YES
 IPSET_DEPENDENCIES = libmnl host-pkg-config
+IPSET_CONF_OPT = --with-ksource=$(LINUX_HEADERS_DIR)
 
 $(eval $(call AUTOTARGETS,package,ipset))
-- 
1.7.3.4

[Buildroot] [git commit] ipset: ensure target kernel headers are used

[Thomas Petazzoni]

Le Fri, 22 Jul 2011 13:51:45 +0200,
Peter Korsgaard <jacmet@sunsite.dk> a ?crit :

> diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
> index 9d901fc..700d2bc 100644
> --- a/package/ipset/ipset.mk
> +++ b/package/ipset/ipset.mk
> @@ -9,5 +9,6 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
>  IPSET_SITE = http://ipset.netfilter.org
>  IPSET_AUTORECONF = YES
>  IPSET_DEPENDENCIES = libmnl host-pkg-config
> +IPSET_CONF_OPT = --with-ksource=$(LINUX_HEADERS_DIR)

I am sorry, but LINUX_HEADERS_DIR is only defined when the internal
toolchain backend is used, so I guess this is broken for external
toolchain or ct-ng toolchain builds.

bridge-utils, busybox and iptables are already using LINUX_HEADERS_DIR,
but I guess this needs some work as well.

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [git commit] ipset: ensure target kernel headers are used

[Peter Korsgaard]

>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:

 Thomas> Le Fri, 22 Jul 2011 13:51:45 +0200,
 Thomas> Peter Korsgaard <jacmet@sunsite.dk> a ?crit :

 >> diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
 >> index 9d901fc..700d2bc 100644
 >> --- a/package/ipset/ipset.mk
 >> +++ b/package/ipset/ipset.mk
 >> @@ -9,5 +9,6 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
 >> IPSET_SITE = http://ipset.netfilter.org
 >> IPSET_AUTORECONF = YES
 >> IPSET_DEPENDENCIES = libmnl host-pkg-config
 >> +IPSET_CONF_OPT = --with-ksource=$(LINUX_HEADERS_DIR)

 Thomas> I am sorry, but LINUX_HEADERS_DIR is only defined when the internal
 Thomas> toolchain backend is used, so I guess this is broken for external
 Thomas> toolchain or ct-ng toolchain builds.

 Thomas> bridge-utils, busybox and iptables are already using LINUX_HEADERS_DIR,
 Thomas> but I guess this needs some work as well.

Ah yes, what should we do for external toolchains then - point
LINUX_HEADERS_DIR at $(STAGING_DIR)/usr/include/linux?

-- 
Bye, Peter Korsgaard

[Buildroot] [git commit] ipset: ensure target kernel headers are used

[Gustavo Zacarias]

On Mon, 25 Jul 2011 09:55:04 +0200, Peter Korsgaard wrote:

>>>>>> "Thomas" == Thomas Petazzoni 
>>>>>> <thomas.petazzoni@free-electrons.com> writes:
>
>  Thomas> Le Fri, 22 Jul 2011 13:51:45 +0200,
>  Thomas> Peter Korsgaard <jacmet@sunsite.dk> a ?crit :
>
>  >> diff --git a/package/ipset/ipset.mk b/package/ipset/ipset.mk
>  >> index 9d901fc..700d2bc 100644
>  >> --- a/package/ipset/ipset.mk
>  >> +++ b/package/ipset/ipset.mk
>  >> @@ -9,5 +9,6 @@ IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
>  >> IPSET_SITE = http://ipset.netfilter.org
>  >> IPSET_AUTORECONF = YES
>  >> IPSET_DEPENDENCIES = libmnl host-pkg-config
>  >> +IPSET_CONF_OPT = --with-ksource=$(LINUX_HEADERS_DIR)
>
>  Thomas> I am sorry, but LINUX_HEADERS_DIR is only defined when the 
> internal
>  Thomas> toolchain backend is used, so I guess this is broken for 
> external
>  Thomas> toolchain or ct-ng toolchain builds.
>
>  Thomas> bridge-utils, busybox and iptables are already using
> LINUX_HEADERS_DIR,
>  Thomas> but I guess this needs some work as well.
>
> Ah yes, what should we do for external toolchains then - point
> LINUX_HEADERS_DIR at $(STAGING_DIR)/usr/include/linux?

Just sent a patch that kills the kernel check, it's probably the 
simplest way to deal with this looking forward.
Most of the checks are to know if the package needs to build modules to 
support ipset for older (<2.6.39) kernels which we don't handle.
There are also checks for proper kernel config options but i don't 
think we want to go down that road since other packages depend on other 
kernel options as well (tun/tap for openvpn, netfilter for iptables and 
so on...)
Regards.