diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-06-19 00:09:09 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-06-24 17:32:37 -0400 |
commit | 3041e47e8b08d51188b2cbdbd9c1e6f43314c8f1 (patch) | |
tree | 9cdfff6223bd5d1ee03fbf8d036501cf711c03cd /Makefile | |
parent | ac031f26e89cc04fc7504f31ae137857eb83a051 (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>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -446,7 +446,11 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; | |||
446 | # if auto.conf.cmd is missing then we are probarly in a cleaned tree so | 446 | # if auto.conf.cmd is missing then we are probarly in a cleaned tree so |
447 | # we execute the config step to be sure to catch updated Kconfig files | 447 | # we execute the config step to be sure to catch updated Kconfig files |
448 | include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd | 448 | include/config/auto.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd |
449 | ifeq ($(KBUILD_EXTMOD),) | ||
449 | $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig | 450 | $(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig |
451 | else | ||
452 | $(error kernel configuration not valid - run 'make prepare' in $(srctree) to update it) | ||
453 | endif | ||
450 | 454 | ||
451 | else | 455 | else |
452 | # Dummy target needed, because used as prerequisite | 456 | # Dummy target needed, because used as prerequisite |