From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 15 Aug 2018 19:50:10 +0000 (-0700)
Subject: Merge tag 'kconfig-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy... 
X-Git-Tag: v4.19-rc1~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01f0e5cdedea448ea48eaddc1366593126b0fe98;p=thirdparty%2Flinux.git

Merge tag 'kconfig-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kconfig updates from Masahiro Yamada:

 - show clearer error messages where pkg-config is needed, but not
   installed

 - rename SYMBOL_AUTO to SYMBOL_NO_WRITE to reflect its semantics

 - create all necessary directories by Kconfig tool itself instead of
   Makefile

 - update the .config unconditionally when syncconfig is invoked

 - use 'include' directive instead of '-include' where
   include/config/{auto,tristate}.conf is mandatory

 - do not try to update the .config when running install targets

 - add .DELETE_ON_ERROR to delete partially updated files

 - misc cleanups and fixes

* tag 'kconfig-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  kconfig: remove P_ENV property type
  kconfig: remove unused sym_get_env_prop() function
  kconfig: fix the rule of mainmenu_stmt symbol
  init/Kconfig: Use short unix-style option instead of --longname
  Kbuild: Makefile.modbuiltin: include auto.conf and tristate.conf mandatory
  kbuild: remove auto.conf from prerequisite of phony targets
  kbuild: do not update config for 'make kernelrelease'
  kbuild: do not update config when running install targets
  kbuild: add .DELETE_ON_ERROR special target
  kbuild: use 'include' directive to load auto.conf from top Makefile
  kconfig: allow all config targets to write auto.conf if missing
  kconfig: make syncconfig update .config regardless of sym_change_count
  kconfig: create directories needed for syncconfig by itself
  kconfig: remove unneeded directory generation from local*config
  kconfig: split out useful helpers in confdata.c
  kconfig: rename file_write_dep and move it to confdata.c
  kconfig: fix typos in description of "choice" in kconfig-language.txt
  kconfig: handle format string before calling conf_message_callback()
  kconfig: rename SYMBOL_AUTO to SYMBOL_NO_WRITE
  kconfig: check for pkg-config on make {menu,n,g,x}config
---

01f0e5cdedea448ea48eaddc1366593126b0fe98
diff --cc Makefile
index cc4875d5cacab,f17dd994e01d7..a0650bf796061
--- a/Makefile
+++ b/Makefile
@@@ -224,11 -224,14 +224,14 @@@ clean-targets := %clean mrproper cleand
  no-dot-config-targets := $(clean-targets) \
  			 cscope gtags TAGS tags help% %docs check% coccicheck \
  			 $(version_h) headers_% archheaders archscripts \
 -			 kernelversion %src-pkg
 +			 %asm-generic kernelversion %src-pkg
+ no-sync-config-targets := $(no-dot-config-targets) install %install \
+ 			   kernelrelease
  
- config-targets := 0
- mixed-targets  := 0
- dot-config     := 1
+ config-targets  := 0
+ mixed-targets   := 0
+ dot-config      := 1
+ may-sync-config := 1
  
  ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)
  	ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)