mirror of
https://github.com/torvalds/linux.git
synced 2025-10-31 00:28:52 +02:00
1f937a4bcb
merge_config does not respect the Make's -s (--silent) option. Let's sink the stdout from merge_config for silent builds. This commit does not cater to the direct invocation of merge_config.sh (e.g. arch/mips/Makefile). Reported-by: Leon Romanovsky <leon@kernel.org> Closes: https://lore.kernel.org/all/e534ce33b0e1060eb85ece8429810f087b034c88.1733234008.git.leonro@nvidia.com/ Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Tested-by: Leon Romanovsky <leon@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
30 lines
1 KiB
Text
30 lines
1 KiB
Text
# SPDX-License-Identifier: GPL-2.0
|
|
# Configuration heplers
|
|
|
|
cmd_merge_fragments = \
|
|
$(srctree)/scripts/kconfig/merge_config.sh \
|
|
$4 -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$2 \
|
|
$(foreach config,$3,$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
|
|
|
|
# Creates 'merged defconfigs'
|
|
# ---------------------------------------------------------------------------
|
|
# Usage:
|
|
# $(call merge_into_defconfig,base_config,config_fragment1 config_fragment2 ...)
|
|
#
|
|
# Input config fragments without '.config' suffix
|
|
define merge_into_defconfig
|
|
$(call cmd,merge_fragments,$1,$2)
|
|
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
|
|
endef
|
|
|
|
|
|
# Creates 'merged defconfigs without warning about overrides'
|
|
# ---------------------------------------------------------------------------
|
|
# Usage:
|
|
# $(call merge_into_defconfig_override,base_config,config_fragment1 config_fragment2 ...)
|
|
#
|
|
# Input config fragments without '.config' suffix
|
|
define merge_into_defconfig_override
|
|
$(call cmd,merge_fragments,$1,$2,-Q)
|
|
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
|
|
endef
|