summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2012-02-16 19:56:37 +0100
committerMichal Marek <mmarek@suse.cz>2012-02-25 00:01:28 +0100
commitdddcbb7ce3a9947710137d06d0157a2355be93dc (patch)
tree0b4bec5b50098b0a6f798cf4307348b4f1e0a09a
parentd7d357bc279453d402e96527bdcc5b40299f1cf0 (diff)
downloadlinux-dddcbb7ce3a9947710137d06d0157a2355be93dc.tar.gz
linux-dddcbb7ce3a9947710137d06d0157a2355be93dc.tar.bz2
linux-dddcbb7ce3a9947710137d06d0157a2355be93dc.zip
kbuild: Fix out-of-tree build for 'make deb-pkg'
The out-of-tree build is broken in 'make deb-pkg'. The header checks and the header install works on the source and not on the object tree. While fixing this also replace the direct 'make' invocations with the $MAKE variable to be consistent within the script. Cc: maximilian attems <max@stro.at> Cc: Ben Hutchings <ben@decadent.org.uk> Cc: debian-kernel@lists.debian.org Cc: linux-kbuild@vger.kernel.org Signed-off-by: Joerg Roedel <joerg.roedel@amd.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--scripts/package/builddeb6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 0db889f865c4..eee5f8ed2493 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -121,7 +121,7 @@ else
fi
if grep -q '^CONFIG_MODULES=y' .config ; then
- INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
+ INSTALL_MOD_PATH="$tmpdir" $MAKE KBUILD_SRC= modules_install
rm -f "$tmpdir/lib/modules/$version/build"
rm -f "$tmpdir/lib/modules/$version/source"
if [ "$ARCH" = "um" ] ; then
@@ -131,8 +131,8 @@ if grep -q '^CONFIG_MODULES=y' .config ; then
fi
if [ "$ARCH" != "um" ]; then
- make headers_check
- make headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
+ $MAKE headers_check KBUILD_SRC=
+ $MAKE headers_install KBUILD_SRC= INSTALL_HDR_PATH="$libc_headers_dir/usr"
fi
# Install the maintainer scripts