[PATCH v2] builddeb: fix missing headers in linux-headers package

[PATCH v2] builddeb: fix missing headers in linux-headers package

[Fathi Boudra]

The kernel headers package (linux-headers) doesn't include several
header files required to build out-of-tree modules.

It makes the package unusable on e.g. ARM architecture:
 /usr/src/linux-headers-3.14.0/arch/arm/include/asm/memory.h:24:25:
 fatal error: mach/memory.h: No such file or directory
 #include <mach/memory.h>
 ^
 compilation terminated.

Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
---
 Changes from v1:
 - add missing module.lds, mips/Kbuild.platforms and Platform files
 - generically look for all include directories in arch/$SRCARCH

 scripts/package/builddeb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index f46e4dd..42b1e20 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -287,9 +287,11 @@ EOF
 
 fi
 
-# Build header package
+# Build kernel header package
 (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
 (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
+(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform >> "$objtree/debian/hdrsrcfiles")
+(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f >> "$objtree/debian/hdrsrcfiles")
 (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
-- 
1.9.1

Re: [PATCH v2] builddeb: fix missing headers in linux-headers package

[Fathi Boudra]

Ben, Michal, what about this patch?

On 15 April 2014 14:51, Fathi Boudra <fathi.boudra@linaro.org> wrote:
> The kernel headers package (linux-headers) doesn't include several
> header files required to build out-of-tree modules.
>
> It makes the package unusable on e.g. ARM architecture:
>  /usr/src/linux-headers-3.14.0/arch/arm/include/asm/memory.h:24:25:
>  fatal error: mach/memory.h: No such file or directory
>  #include <mach/memory.h>
>  ^
>  compilation terminated.
>
> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
> ---
>  Changes from v1:
>  - add missing module.lds, mips/Kbuild.platforms and Platform files
>  - generically look for all include directories in arch/$SRCARCH
>
>  scripts/package/builddeb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index f46e4dd..42b1e20 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -287,9 +287,11 @@ EOF
>
>  fi
>
> -# Build header package
> +# Build kernel header package
>  (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
>  (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
> +(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform >> "$objtree/debian/hdrsrcfiles")
> +(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f >> "$objtree/debian/hdrsrcfiles")
>  (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
>  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
>  mkdir -p "$destdir"
> --
> 1.9.1

Re: [PATCH v2] builddeb: fix missing headers in linux-headers package

[Fathi Boudra]

gentle ping

On 25 April 2014 09:12, Fathi Boudra <fathi.boudra@linaro.org> wrote:
> Ben, Michal, what about this patch?
>
> On 15 April 2014 14:51, Fathi Boudra <fathi.boudra@linaro.org> wrote:
>> The kernel headers package (linux-headers) doesn't include several
>> header files required to build out-of-tree modules.
>>
>> It makes the package unusable on e.g. ARM architecture:
>>  /usr/src/linux-headers-3.14.0/arch/arm/include/asm/memory.h:24:25:
>>  fatal error: mach/memory.h: No such file or directory
>>  #include <mach/memory.h>
>>  ^
>>  compilation terminated.
>>
>> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
>> ---
>>  Changes from v1:
>>  - add missing module.lds, mips/Kbuild.platforms and Platform files
>>  - generically look for all include directories in arch/$SRCARCH
>>
>>  scripts/package/builddeb | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>> index f46e4dd..42b1e20 100644
>> --- a/scripts/package/builddeb
>> +++ b/scripts/package/builddeb
>> @@ -287,9 +287,11 @@ EOF
>>
>>  fi
>>
>> -# Build header package
>> +# Build kernel header package
>>  (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
>>  (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
>> +(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform >> "$objtree/debian/hdrsrcfiles")
>> +(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f >> "$objtree/debian/hdrsrcfiles")
>>  (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
>>  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
>>  mkdir -p "$destdir"
>> --
>> 1.9.1

Re: [PATCH v2] builddeb: fix missing headers in linux-headers package

[Fathi Boudra]

Michal,

This patch is sitting here since 2 months without any reply and you
just sent the pull request for 3.16-rc1.
The linux-headers package is broken...

On 9 May 2014 09:42, Fathi Boudra <fathi.boudra@linaro.org> wrote:
> gentle ping
>
> On 25 April 2014 09:12, Fathi Boudra <fathi.boudra@linaro.org> wrote:
>> Ben, Michal, what about this patch?
>>
>> On 15 April 2014 14:51, Fathi Boudra <fathi.boudra@linaro.org> wrote:
>>> The kernel headers package (linux-headers) doesn't include several
>>> header files required to build out-of-tree modules.
>>>
>>> It makes the package unusable on e.g. ARM architecture:
>>>  /usr/src/linux-headers-3.14.0/arch/arm/include/asm/memory.h:24:25:
>>>  fatal error: mach/memory.h: No such file or directory
>>>  #include <mach/memory.h>
>>>  ^
>>>  compilation terminated.
>>>
>>> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
>>> ---
>>>  Changes from v1:
>>>  - add missing module.lds, mips/Kbuild.platforms and Platform files
>>>  - generically look for all include directories in arch/$SRCARCH
>>>
>>>  scripts/package/builddeb | 4 +++-
>>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>>> index f46e4dd..42b1e20 100644
>>> --- a/scripts/package/builddeb
>>> +++ b/scripts/package/builddeb
>>> @@ -287,9 +287,11 @@ EOF
>>>
>>>  fi
>>>
>>> -# Build header package
>>> +# Build kernel header package
>>>  (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
>>>  (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
>>> +(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform >> "$objtree/debian/hdrsrcfiles")
>>> +(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f >> "$objtree/debian/hdrsrcfiles")
>>>  (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
>>>  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
>>>  mkdir -p "$destdir"
>>> --
>>> 1.9.1

Re: [PATCH v2] builddeb: fix missing headers in linux-headers package

[Michal Marek]

Dne 15.4.2014 13:51, Fathi Boudra napsal(a):
> The kernel headers package (linux-headers) doesn't include several
> header files required to build out-of-tree modules.
> 
> It makes the package unusable on e.g. ARM architecture:
>  /usr/src/linux-headers-3.14.0/arch/arm/include/asm/memory.h:24:25:
>  fatal error: mach/memory.h: No such file or directory
>  #include <mach/memory.h>
>  ^
>  compilation terminated.
> 
> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
> ---
>  Changes from v1:
>  - add missing module.lds, mips/Kbuild.platforms and Platform files
>  - generically look for all include directories in arch/$SRCARCH

Ben, is this version OK to merge? Does the package now match the
official Debian ones?

Thanks,
Michal


>  scripts/package/builddeb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index f46e4dd..42b1e20 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -287,9 +287,11 @@ EOF
>  
>  fi
>  
> -# Build header package
> +# Build kernel header package
>  (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
>  (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
> +(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform >> "$objtree/debian/hdrsrcfiles")
> +(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f >> "$objtree/debian/hdrsrcfiles")
>  (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
>  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
>  mkdir -p "$destdir"

Re: [PATCH v2] builddeb: fix missing headers in linux-headers package

[Ben Hutchings]

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

On Fri, 2014-06-13 at 13:39 +0200, Michal Marek wrote:
> Dne 15.4.2014 13:51, Fathi Boudra napsal(a):
> > The kernel headers package (linux-headers) doesn't include several
> > header files required to build out-of-tree modules.
> > 
> > It makes the package unusable on e.g. ARM architecture:
> >  /usr/src/linux-headers-3.14.0/arch/arm/include/asm/memory.h:24:25:
> >  fatal error: mach/memory.h: No such file or directory
> >  #include <mach/memory.h>
> >  ^
> >  compilation terminated.
> > 
> > Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
> > ---
> >  Changes from v1:
> >  - add missing module.lds, mips/Kbuild.platforms and Platform files
> >  - generically look for all include directories in arch/$SRCARCH
> 
> Ben, is this version OK to merge? Does the package now match the
> official Debian ones?

This is not exactly the same, but I think it's good.

Reviewed-by: Ben Hutchings <ben@decadent.org.uk>

Ben.

> Thanks,
> Michal
> 
> 
> >  scripts/package/builddeb | 4 +++-
> >  1 file changed, 3 insertions(+), 1 deletion(-)
> > 
> > diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> > index f46e4dd..42b1e20 100644
> > --- a/scripts/package/builddeb
> > +++ b/scripts/package/builddeb
> > @@ -287,9 +287,11 @@ EOF
> >  
> >  fi
> >  
> > -# Build header package
> > +# Build kernel header package
> >  (cd $srctree; find . -name Makefile\* -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
> >  (cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
> > +(cd $srctree; find arch/$SRCARCH -name module.lds -o -name Kbuild.platforms -o -name Platform >> "$objtree/debian/hdrsrcfiles")
> > +(cd $srctree; find $(find arch/$SRCARCH -name include -o -name scripts -type d) -type f >> "$objtree/debian/hdrsrcfiles")
> >  (cd $objtree; find arch/$SRCARCH/include Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
> >  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
> >  mkdir -p "$destdir"
> 
> 
> 

-- 
Ben Hutchings
Tomorrow will be cancelled due to lack of interest.

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

Re: [PATCH v2] builddeb: fix missing headers in linux-headers package

[Michal Marek]

Dne 15.6.2014 17:19, Ben Hutchings napsal(a):
> On Fri, 2014-06-13 at 13:39 +0200, Michal Marek wrote:
>> Dne 15.4.2014 13:51, Fathi Boudra napsal(a):
>>> The kernel headers package (linux-headers) doesn't include several
>>> header files required to build out-of-tree modules.
>>>
>>> It makes the package unusable on e.g. ARM architecture:
>>>  /usr/src/linux-headers-3.14.0/arch/arm/include/asm/memory.h:24:25:
>>>  fatal error: mach/memory.h: No such file or directory
>>>  #include <mach/memory.h>
>>>  ^
>>>  compilation terminated.
>>>
>>> Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
>>> ---
>>>  Changes from v1:
>>>  - add missing module.lds, mips/Kbuild.platforms and Platform files
>>>  - generically look for all include directories in arch/$SRCARCH
>>
>> Ben, is this version OK to merge? Does the package now match the
>> official Debian ones?
> 
> This is not exactly the same, but I think it's good.
> 
> Reviewed-by: Ben Hutchings <ben@decadent.org.uk>

I applied the patch to kbuild.git#rc-fixes.

Thanks,
Michal