Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 01f0e5cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents e026bcc5 18808612

Documentation/kbuild/kconfig-language.txt

+2 −2
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ choices: 


This defines a choice group and accepts any of the above attributes as

options. A choice can only be of type bool or tristate.  If no type is

specified for a choice, it's type will be determined by the type of

specified for a choice, its type will be determined by the type of

the first choice element in the group or remain unknown if none of the

choice elements have a type specified, as well.
@@ -384,7 +384,7 @@ A choice accepts another option "optional", which allows to set the 
choice to 'n' and no entry needs to be selected.

If no [symbol] is associated with a choice, then you can not have multiple

definitions of that choice. If a [symbol] is associated to the choice,

then you may define the same choice (ie. with the same entries) in another

then you may define the same choice (i.e. with the same entries) in another

place.



comment:

Documentation/process/changes.rst

+8 −0
Original line number Diff line number Diff line
@@ -81,6 +81,14 @@ The build system has, as of 4.13, switched to using thin archives (`ar T`) 
rather than incremental linking (`ld -r`) for built-in.a intermediate steps.

This requires binutils 2.20 or newer.



pkg-config

----------



The build system, as of 4.18, requires pkg-config to check for installed

kconfig tools and to determine flags settings for use in

'make {menu,n,g,x}config'.  Previously pkg-config was being used but not

verified or documented.



Flex

----

Makefile

+26 −18
Original line number Diff line number Diff line
@@ -225,10 +225,13 @@ no-dot-config-targets := $(clean-targets) \ 
			 cscope gtags TAGS tags help% %docs check% coccicheck \

			 $(version_h) headers_% archheaders archscripts \

			 %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

may-sync-config := 1



ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),)

	ifeq ($(filter-out $(no-dot-config-targets), $(MAKECMDGOALS)),)
@@ -236,6 +239,16 @@ ifneq ($(filter $(no-dot-config-targets), $(MAKECMDGOALS)),) 
	endif

endif



ifneq ($(filter $(no-sync-config-targets), $(MAKECMDGOALS)),)

	ifeq ($(filter-out $(no-sync-config-targets), $(MAKECMDGOALS)),)

		may-sync-config := 0

	endif

endif



ifneq ($(KBUILD_EXTMOD),)

	may-sync-config := 0

endif



ifeq ($(KBUILD_EXTMOD),)

        ifneq ($(filter config %config,$(MAKECMDGOALS)),)

                config-targets := 1
@@ -585,7 +598,7 @@ virt-y := virt/ 
endif # KBUILD_EXTMOD



ifeq ($(dot-config),1)

-include include/config/auto.conf

include include/config/auto.conf

endif



# The all: target is the default when no target is given on the
@@ -607,7 +620,7 @@ ARCH_CFLAGS := 
include arch/$(SRCARCH)/Makefile



ifeq ($(dot-config),1)

ifeq ($(KBUILD_EXTMOD),)

ifeq ($(may-sync-config),1)

# Read in dependencies to all Kconfig* files, make sure to run syncconfig if

# changes are detected. This should be included after arch/$(SRCARCH)/Makefile

# because some architectures define CROSS_COMPILE there.
@@ -622,8 +635,9 @@ $(KCONFIG_CONFIG) include/config/auto.conf.cmd: ; 
include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd

	$(Q)$(MAKE) -f $(srctree)/Makefile syncconfig

else

# external modules needs include/generated/autoconf.h and include/config/auto.conf

# but do not care if they are up-to-date. Use auto.conf to trigger the test

# External modules and some install targets need include/generated/autoconf.h

# and include/config/auto.conf but do not care if they are up-to-date.

# Use auto.conf to trigger the test

PHONY += include/config/auto.conf



include/config/auto.conf:
@@ -635,11 +649,7 @@ include/config/auto.conf: 
	echo >&2 ;							\

	/bin/false)



endif # KBUILD_EXTMOD



else

# Dummy target needed, because used as prerequisite

include/config/auto.conf: ;

endif # may-sync-config

endif # $(dot-config)



KBUILD_CFLAGS	+= $(call cc-option,-fno-delete-null-pointer-checks,)
@@ -1035,15 +1045,14 @@ define filechk_kernel.release 
endef



# Store (new) KERNELRELEASE string in include/config/kernel.release

include/config/kernel.release: include/config/auto.conf FORCE

include/config/kernel.release: $(srctree)/Makefile FORCE

	$(call filechk,kernel.release)



# Additional helpers built in scripts/

# Carefully list dependencies so we do not try to build scripts twice

# in parallel

PHONY += scripts

scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \

	 asm-generic gcc-plugins $(autoksyms_h)

scripts: scripts_basic asm-generic gcc-plugins $(autoksyms_h)

	$(Q)$(MAKE) $(build)=$(@)



# Things we need to do before we recursively start building the kernel
@@ -1073,8 +1082,7 @@ endif 
# that need to depend on updated CONFIG_* values can be checked here.

prepare2: prepare3 outputmakefile asm-generic



prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h \

                   include/config/auto.conf

prepare1: prepare2 $(version_h) $(autoksyms_h) include/generated/utsrelease.h

	$(cmd_crmodverdir)



archprepare: archheaders archscripts prepare1 scripts_basic
@@ -1212,7 +1220,7 @@ modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin 
modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)

	$(Q)$(AWK) '!x[$$0]++' $^ > $(objtree)/modules.builtin



%/modules.builtin: include/config/auto.conf

%/modules.builtin: include/config/auto.conf include/config/tristate.conf

	$(Q)$(MAKE) $(modbuiltin)=$*

init/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ config DEFCONFIG_LIST 
	string

	depends on !UML

	option defconfig_list

	default "/lib/modules/$(shell,uname --release)/.config"

	default "/lib/modules/$(shell,uname -r)/.config"

	default "/etc/kernel-config"

	default "/boot/config-$(shell,uname --release)"

	default "/boot/config-$(shell,uname -r)"

	default ARCH_DEFCONFIG

	default "arch/$(ARCH)/defconfig"

scripts/Kbuild.include

+3 −0
Original line number Diff line number Diff line
@@ -400,3 +400,6 @@ endif 
endef

#

###############################################################################



# delete partially updated (i.e. corrupted) files on error

.DELETE_ON_ERROR: