diff options
author | Sam Ravnborg <sam@mars.(none)> | 2005-07-14 16:26:09 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.(none)> | 2005-07-14 16:26:09 -0400 |
commit | a91f98a284321ffc9eb28ccfbf4329f7aa422f97 (patch) | |
tree | ba3589c5b2c72744f2584c98e0840c2d7b5a0bb8 /scripts/package | |
parent | dc5962fdf13f4d10a5fb8d0b0ae6f406ee8aed49 (diff) |
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>
Diffstat (limited to 'scripts/package')
-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 353b8ea5c32c..8afdef921cb7 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
@@ -59,7 +59,7 @@ $(objtree)/binkernel.spec: $(MKSPEC) $(srctree)/Makefile | |||
59 | $(CONFIG_SHELL) $(MKSPEC) prebuilt > $@ | 59 | $(CONFIG_SHELL) $(MKSPEC) prebuilt > $@ |
60 | 60 | ||
61 | binrpm-pkg: $(objtree)/binkernel.spec | 61 | binrpm-pkg: $(objtree)/binkernel.spec |
62 | $(MAKE) | 62 | $(MAKE) KBUILD_SRC= |
63 | set -e; \ | 63 | set -e; \ |
64 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version | 64 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version |
65 | set -e; \ | 65 | set -e; \ |
@@ -74,7 +74,7 @@ clean-files += $(objtree)/binkernel.spec | |||
74 | # | 74 | # |
75 | .PHONY: deb-pkg | 75 | .PHONY: deb-pkg |
76 | deb-pkg: | 76 | deb-pkg: |
77 | $(MAKE) | 77 | $(MAKE) KBUILD_SRC= |
78 | $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb | 78 | $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb |
79 | 79 | ||
80 | clean-dirs += $(objtree)/debian/ | 80 | clean-dirs += $(objtree)/debian/ |
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 7edd4a095902..6edb29f2b4a6 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb | |||
@@ -41,7 +41,7 @@ else | |||
41 | fi | 41 | fi |
42 | 42 | ||
43 | if grep -q '^CONFIG_MODULES=y' .config ; then | 43 | if grep -q '^CONFIG_MODULES=y' .config ; then |
44 | INSTALL_MOD_PATH="$tmpdir" make modules_install | 44 | INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install |
45 | if [ "$ARCH" == "um" ] ; then | 45 | if [ "$ARCH" == "um" ] ; then |
46 | mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" | 46 | mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" |
47 | rmdir "$tmpdir/lib/modules/$version" | 47 | rmdir "$tmpdir/lib/modules/$version" |