Skip to content

Commit

Permalink
kbuild: always run 'make silentoldconfig' when tree is cleaned
Browse files Browse the repository at this point in the history
If the file .kconfig.d is missing then make sure to run
'make silentoldconfig', since we have no way to detect if
a Kconfig file has been updated.

-kconfig.d is created by kconfig and is removed as part
of 'make clean' so the situation is likely to occur in reality.

Jan Beulich <JBeulich@novell.com> reported this bug.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
  • Loading branch information
Sam Ravnborg committed Dec 26, 2005
1 parent 54e08a2 commit 752625c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -477,18 +477,20 @@ ifeq ($(dot-config),1)

# Read in dependencies to all Kconfig* files, make sure to run
# oldconfig if changes are detected.
-include .config.cmd
-include .kconfig.d

include .config

# If .config needs to be updated, it will be done via the dependency
# that autoconf has on .config.
# To avoid any implicit rule to kick in, define an empty command
.config: ;
.config .kconfig.d: ;

# If .config is newer than include/linux/autoconf.h, someone tinkered
# with it and forgot to run make oldconfig
include/linux/autoconf.h: .config
# with it and forgot to run make oldconfig.
# If kconfig.d 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/linux/autoconf.h: .kconfig.d .config
$(Q)mkdir -p include/linux
$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
else
Expand Down
2 changes: 1 addition & 1 deletion scripts/kconfig/util.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ int file_write_dep(const char *name)
FILE *out;

if (!name)
name = ".config.cmd";
name = ".kconfig.d";
out = fopen("..config.tmp", "w");
if (!out)
return 1;
Expand Down

0 comments on commit 752625c

Please sign in to comment.