[PATCH] Use the kernel source tree for includes, not the kernel build tree

[PATCH] Use the kernel source tree for includes, not the kernel build tree

[Pavel Roskin]

If the build is done outside the source tree, nl80211.h won't be in the
build tree.  We only need only definitions from the sources, not the
kernel configuration.

Signed-off-by: Pavel Roskin <proski@gnu.org>
---
 Makefile  |    2 +-
 defconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 74cb1e1..9e79381 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ INSTALL ?= install
 PREFIX ?= /usr
 CC ?= "gcc"
 CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
-CFLAGS += -I/lib/modules/`uname -r`/build/include
+CFLAGS += -I/lib/modules/`uname -r`/source/include
 CFLAGS += -O2 -g
 LDFLAGS += -lnl
 
diff --git a/defconfig b/defconfig
index 346f699..0081911 100644
--- a/defconfig
+++ b/defconfig
@@ -11,7 +11,7 @@
 
 # Kernel location for GIT NL80211 kernel code (assumed to be running,
 # by default); only required if your installed nl80211.h is out of date.
-CONFIG_KERNEL_LOC = /lib/modules/`uname -r`/build/
+CONFIG_KERNEL_LOC = /lib/modules/`uname -r`/source/
 CFLAGS += -I$(CONFIG_KERNEL_LOC)/include
 
 # LibNL location

Re: [PATCH] Use the kernel source tree for includes, not the kernel build tree

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 879 bytes --]

On Tue, 2008-09-16 at 16:08 -0400, Pavel Roskin wrote:
> If the build is done outside the source tree, nl80211.h won't be in the
> build tree.  We only need only definitions from the sources, not the
> kernel configuration.

good catch

> Signed-off-by: Pavel Roskin <proski@gnu.org>
> ---
>  Makefile  |    2 +-
>  defconfig |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 74cb1e1..9e79381 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -6,7 +6,7 @@ INSTALL ?= install
>  PREFIX ?= /usr
>  CC ?= "gcc"
>  CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
> -CFLAGS += -I/lib/modules/`uname -r`/build/include
> +CFLAGS += -I/lib/modules/`uname -r`/source/include

I'll remove that line entirely though.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] Use the kernel source tree for includes, not the kernel build tree

[Pavel Roskin]

On Tue, 2008-09-16 at 22:18 +0200, Johannes Berg wrote:

> > diff --git a/Makefile b/Makefile
> > index 74cb1e1..9e79381 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -6,7 +6,7 @@ INSTALL ?= install
> >  PREFIX ?= /usr
> >  CC ?= "gcc"
> >  CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
> > -CFLAGS += -I/lib/modules/`uname -r`/build/include
> > +CFLAGS += -I/lib/modules/`uname -r`/source/include
> 
> I'll remove that line entirely though.

In Makefile?  Please make sure that .config remains optional.

-- 
Regards,
Pavel Roskin

Re: [PATCH] Use the kernel source tree for includes, not the kernel build tree

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

On Tue, 2008-09-16 at 16:34 -0400, Pavel Roskin wrote:
> On Tue, 2008-09-16 at 22:18 +0200, Johannes Berg wrote:
> 
> > > diff --git a/Makefile b/Makefile
> > > index 74cb1e1..9e79381 100644
> > > --- a/Makefile
> > > +++ b/Makefile
> > > @@ -6,7 +6,7 @@ INSTALL ?= install
> > >  PREFIX ?= /usr
> > >  CC ?= "gcc"
> > >  CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
> > > -CFLAGS += -I/lib/modules/`uname -r`/build/include
> > > +CFLAGS += -I/lib/modules/`uname -r`/source/include
> > 
> > I'll remove that line entirely though.
> 
> In Makefile?  Please make sure that .config remains optional.

Yes; we actually ship nl80211.h out of the kernel already. So if your
installed kernel headers are new enough, you don't need .config, if they
aren't you might need .config, before you had to have it always anyway.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]