summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-18 21:09:09 -0700
committerSam Ravnborg <sam@mars.ravnborg.org>2006-06-24 23:32:37 +0200
commit3041e47e8b08d51188b2cbdbd9c1e6f43314c8f1 (patch)
tree9cdfff6223bd5d1ee03fbf8d036501cf711c03cd
parentac031f26e89cc04fc7504f31ae137857eb83a051 (diff)
kbuild: fix silentoldconfig recursion
kconfig-fix-config-dependencies causes this: make CC=cc KBUILD_VERBOSE=1 -C /usr/src/25 SUBDIRS=/home/akpm/NVIDIA-Linux-x86_64-1.0-8762-pkg2/usr/src/nv modules make -f /usr/src/devel/Makefile silentoldconfig make -f /usr/src/devel/Makefile silentoldconfig make -f /usr/src/devel/Makefile silentoldconfig The basic problem is if we compile external modules, config-targets isn't set which can cause recursive calls to silentoldconfig to update the kernel configuration. Bail out and ask the user to update manually. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index d810d6cb4d08..1888fabe4032 100644
--- a/Makefile
+++ b/Makefile
@@ -446,7 +446,11 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
# if auto.conf.cmd is missing then we are probarly in a cleaned tree so
# we execute the config step to be sure to catch updated Kconfig files
include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
+ifeq ($(KBUILD_EXTMOD),)
$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
+else
+ $(error kernel configuration not valid - run 'make prepare' in $(srctree) to update it)
+endif
else
# Dummy target needed, because used as prerequisite