diff options
| author | Nicolas de Pesloüan <nicolas.2p.debian@free.fr> | 2011-01-24 14:41:41 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2011-02-04 14:53:45 +0100 |
| commit | 9b4ce7bce5f30712fd926ab4599a803314a07719 (patch) | |
| tree | 1ec8ad5957da55059a774c31697e98c47b26c67c | |
| parent | 1b9a50d931a04ba007cc1a926fead3ff4b5afa9b (diff) | |
| download | lwn-9b4ce7bce5f30712fd926ab4599a803314a07719.tar.gz lwn-9b4ce7bce5f30712fd926ab4599a803314a07719.zip | |
deb-pkg: Fix building outside of source tree (O=...).
When building linux-headers package using deb-pkg, builddeb erroneously assume
current directory is the source tree. This is not true if building in another
directory, using make O=... deb-pkg.
This patch fix this problem.
Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Tested-by: Nikolai Kondrashov <spbnick@gmail.com>
Acked-by: maximilian attems <max@stro.at>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -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 ebc6d6e9d778..f6cbc3ddb68b 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/$SRCARCH/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) |