tree ba3589c5b2c72744f2584c98e0840c2d7b5a0bb8
parent dc5962fdf13f4d10a5fb8d0b0ae6f406ee8aed49
author Sam Ravnborg <[EMAIL PROTECTED](none)> Thu, 14 Jul 2005 20:26:09 +0000
committer Sam Ravnborg <[EMAIL PROTECTED](none)> Thu, 14 Jul 2005 20:26:09 +0000
kbuild: Fix bug in make deb-pkg when using seperate source and output
directories
From: Ryan Anderson <[EMAIL PROTECTED]>
When running "make O=something deb-pkg", I get a failure that claims I
haven't configured my kernel (I have). Running it a second time tells
me to run "make mrproper" (include/linux/version.h got built on the
first run)
Original patch from:
From: Ajay Patel <[EMAIL PROTECTED]>
With modifications from:
Signed-off-By: Ryan Anderson <[EMAIL PROTECTED]>
Signed-off-by: Sam Ravnborg <[EMAIL PROTECTED]>
scripts/package/Makefile | 4 ++--
scripts/package/builddeb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -59,7 +59,7 @@ $(objtree)/binkernel.spec: $(MKSPEC) $(s
$(CONFIG_SHELL) $(MKSPEC) prebuilt > $@
binrpm-pkg: $(objtree)/binkernel.spec
- $(MAKE)
+ $(MAKE) KBUILD_SRC=
set -e; \
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
set -e; \
@@ -74,7 +74,7 @@ clean-files += $(objtree)/binkernel.spec
#
.PHONY: deb-pkg
deb-pkg:
- $(MAKE)
+ $(MAKE) KBUILD_SRC=
$(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
clean-dirs += $(objtree)/debian/
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -41,7 +41,7 @@ else
fi
if grep -q '^CONFIG_MODULES=y' .config ; then
- INSTALL_MOD_PATH="$tmpdir" make modules_install
+ INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
if [ "$ARCH" == "um" ] ; then
mv "$tmpdir/lib/modules/$version"/*
"$tmpdir/usr/lib/uml/modules/$version/"
rmdir "$tmpdir/lib/modules/$version"
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
