diff mbox

Add mach-specific includes

Message ID 1344764843-2179-1-git-send-email-tzafrir.cohen@xorcom.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tzafrir Cohen Aug. 12, 2012, 9:47 a.m. UTC
When building a deb package, the linux-headers package should also
add arch/$ARCH/mach-*/include Required for arm and probably some
other architectures: avr32 and blackfin.

This is needed to allow building modules using the headers package.

Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
---
 scripts/package/builddeb |    3 +++
 1 file changed, 3 insertions(+)

Comments

Michal Marek Aug. 31, 2012, 1:45 p.m. UTC | #1
Adding Max.

On 12.8.2012 11:47, Tzafrir Cohen wrote:
> When building a deb package, the linux-headers package should also
> add arch/$ARCH/mach-*/include Required for arm and probably some
> other architectures: avr32 and blackfin.
> 
> This is needed to allow building modules using the headers package.
> 
> Signed-off-by: Tzafrir Cohen <tzafrir.cohen@xorcom.com>
> ---
>  scripts/package/builddeb |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index acb8650..16f8c1a 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -245,6 +245,9 @@ fi
>  # Build 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")
> +if echo arch/$SRCARCH/mach-*/include | grep q -v '*'; then

This should probably be grep -q, but it's quite ugly anyway. You can
simply run the find command and redirect it's stderr to /dev/null.

Michal

> +	(cd $srctree; find arch/$SRCARCH/mach-*/include -type f >> "$objtree/debian/hdrsrcfiles")
> +fi
>  (cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
>  destdir=$kernel_headers_dir/usr/src/linux-headers-$version
>  mkdir -p "$destdir"
> 


--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tzafrir Cohen Sept. 5, 2012, 1:33 p.m. UTC | #2
On Fri, Aug 31, 2012 at 03:45:23PM +0200, Michal Marek wrote:
> 
> On 12.8.2012 11:47, Tzafrir Cohen wrote:

> > +if echo arch/$SRCARCH/mach-*/include | grep q -v '*'; then
> 
> This should probably be grep -q, but it's quite ugly anyway. You can
> simply run the find command and redirect it's stderr to /dev/null.

Redirect its stdout, that is. I'd prefer -q but here's a version with a
redirection.
Jan Engelhardt Sept. 9, 2012, 9:55 p.m. UTC | #3
On Friday 2012-08-31 15:45, Michal Marek wrote:
>>  # Build 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")
>> +if echo arch/$SRCARCH/mach-*/include | grep q -v '*'; then
>
>This should probably be grep -q, but it's quite ugly anyway.

Use of -q should probably be preferred to >/dev/null,
because with the latter, you will still pay the price
of printf.
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index acb8650..16f8c1a 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -245,6 +245,9 @@  fi
 # Build 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")
+if echo arch/$SRCARCH/mach-*/include | grep q -v '*'; then
+	(cd $srctree; find arch/$SRCARCH/mach-*/include -type f >> "$objtree/debian/hdrsrcfiles")
+fi
 (cd $objtree; find arch/$SRCARCH/include .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"