diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-09 16:56:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-09 16:56:33 -0800 |
| commit | 6148a47ac3872092d4bc4888838bec6dff16654d (patch) | |
| tree | 9690ceb9d49c70f6eb3a4f8ffcc7d9ba3db8caf3 | |
| parent | d3d373e0e3f51f335d8c722dd1340ab812fdf94b (diff) | |
| parent | 0f54088aac3fc744cae0cbc4f021fc377e48a00c (diff) | |
| download | olio-linux-3.10-6148a47ac3872092d4bc4888838bec6dff16654d.tar.xz olio-linux-3.10-6148a47ac3872092d4bc4888838bec6dff16654d.zip | |
Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
deb-pkg: Fix building outside of source tree (O=...).
deb-pkg: Use $SRCARCH for include path
| -rw-r--r-- | scripts/package/builddeb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index b0b2357aef4..f6cbc3ddb68 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -238,12 +238,12 @@ EOF fi # Build header package -find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$ -find arch/x86/include include scripts -type f >> /tmp/files$$ +(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$) +(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$) (cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$) destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" -tar -c -f - -T /tmp/files$$ | (cd $destdir; tar -xf -) +(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -) (cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -) rm -f /tmp/files$$ /tmp/objfiles$$ arch=$(dpkg --print-architecture) |