aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2016-11-30 17:41:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-01 13:19:22 -0500
commitd3fc425e819be7c251a9c208cd4c0a6373c19bfe (patch)
tree0af8ce6f9eb35a38532c7c97b7177bb73b2010f8
parent43c4f67c966deb1478dc9acbf66ab547287d530f (diff)
kbuild: make sure autoksyms.h exists early
Some people are able to trigger a race where autoksyms.h is used before its empty version is even created. Let's create it at the same time as the directory holding it is created. Signed-off-by: Nicolas Pitre <nico@linaro.org> Tested-by: Prarit Bhargava <prarit@redhat.com> Tested-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--Makefile2
-rw-r--r--scripts/kconfig/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 694111b43cf8..9f9c3b577c75 100644
--- a/Makefile
+++ b/Makefile
@@ -1019,8 +1019,6 @@ prepare2: prepare3 prepare-compiler-check outputmakefile asm-generic
1019prepare1: prepare2 $(version_h) include/generated/utsrelease.h \ 1019prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
1020 include/config/auto.conf 1020 include/config/auto.conf
1021 $(cmd_crmodverdir) 1021 $(cmd_crmodverdir)
1022 $(Q)test -e include/generated/autoksyms.h || \
1023 touch include/generated/autoksyms.h
1024 1022
1025archprepare: archheaders archscripts prepare1 scripts_basic 1023archprepare: archheaders archscripts prepare1 scripts_basic
1026 1024
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index ebced77deb9c..90a091b6ae4d 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -35,6 +35,8 @@ nconfig: $(obj)/nconf
35 35
36silentoldconfig: $(obj)/conf 36silentoldconfig: $(obj)/conf
37 $(Q)mkdir -p include/config include/generated 37 $(Q)mkdir -p include/config include/generated
38 $(Q)test -e include/generated/autoksyms.h || \
39 touch include/generated/autoksyms.h
38 $< $(silent) --$@ $(Kconfig) 40 $< $(silent) --$@ $(Kconfig)
39 41
40localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf 42localyesconfig localmodconfig: $(obj)/streamline_config.pl $(obj)/conf