Skip to content

Commit

Permalink
deb-pkg: Fix building outside of source tree (O=...).
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas de Pesloüan authored and Michal Marek committed Feb 4, 2011
1 parent 1b9a50d commit 9b4ce7b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions scripts/package/builddeb
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 9b4ce7b

Please sign in to comment.