summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2009-11-25 15:14:49 +0100
committerMichal Marek <mmarek@suse.cz>2009-12-12 13:08:16 +0100
commit32197c7ffb06b1319850f8fdfa1a49d32a63b79b (patch)
tree35179145156792698f4f68962f0c404162c85d3e
parentdb1d18657c96cc675596077cb60ef50fbe1947f8 (diff)
kbuild: create include/generated in silentoldconfig
The toplevel Makefile creates the directory if it runs silentoldconfig automatically, but if run manually, it fails: $ make mrproper $ make defconfig && make silentoldconfig *** Default configuration is based on 'x86_64_defconfig' # # configuration written to .config # scripts/kconfig/conf -s arch/x86/Kconfig *** Error during update of the kernel configuration. ... Move the mkdir command to the silentoldconfig target to make it work. Signed-off-by: Michal Marek <mmarek@suse.cz>
-rw-r--r--Makefile1
-rw-r--r--scripts/kconfig/Makefile1
2 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 96b32e5bb97..aa608c2959f 100644
--- a/Makefile
+++ b/Makefile
@@ -492,7 +492,6 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
# if auto.conf.cmd is missing then we are probably 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
- $(Q)mkdir -p include/generated
$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
else
# external modules needs include/generated/autoconf.h and include/config/auto.conf
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 80599e3a799..999e8a7d5bf 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -27,6 +27,7 @@ oldconfig: $(obj)/conf
$< -o $(Kconfig)
silentoldconfig: $(obj)/conf
+ $(Q)mkdir -p include/generated
$< -s $(Kconfig)
localmodconfig: $(obj)/streamline_config.pl $(obj)/conf