diff options
| author | Sam Ravnborg <sam@mars.(none)> | 2005-07-14 20:26:09 +0000 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.(none)> | 2005-07-14 20:26:09 +0000 |
| commit | a91f98a284321ffc9eb28ccfbf4329f7aa422f97 (patch) | |
| tree | ba3589c5b2c72744f2584c98e0840c2d7b5a0bb8 | |
| parent | dc5962fdf13f4d10a5fb8d0b0ae6f406ee8aed49 (diff) | |
| download | linux-3.10-a91f98a284321ffc9eb28ccfbf4329f7aa422f97.tar.gz linux-3.10-a91f98a284321ffc9eb28ccfbf4329f7aa422f97.tar.bz2 linux-3.10-a91f98a284321ffc9eb28ccfbf4329f7aa422f97.zip | |
kbuild: Fix bug in make deb-pkg when using seperate source and output directories
From: Ryan Anderson <ryan@michonline.com>
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 <patela@gmail.com>
With modifications from:
Signed-off-By: Ryan Anderson <ryan@michonline.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
| -rw-r--r-- | scripts/package/Makefile | 4 | ||||
| -rw-r--r-- | scripts/package/builddeb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 353b8ea5c32..8afdef921cb 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -59,7 +59,7 @@ $(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile $(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 index 7edd4a09590..6edb29f2b4a 100644 --- 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" |