Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kbuild: suppress stdout from merge_config for silent builds
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>
+10
-7
+7
-6
scripts/Makefile.defconf
+7
-6
scripts/Makefile.defconf
···
1
1
# SPDX-License-Identifier: GPL-2.0
2
2
# Configuration heplers
3
3
4
+
cmd_merge_fragments = \
5
+
$(srctree)/scripts/kconfig/merge_config.sh \
6
+
$4 -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$2 \
7
+
$(foreach config,$3,$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
8
+
4
9
# Creates 'merged defconfigs'
5
10
# ---------------------------------------------------------------------------
6
11
# Usage:
···
13
8
#
14
9
# Input config fragments without '.config' suffix
15
10
define merge_into_defconfig
16
-
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
17
-
-m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
18
-
$(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
11
+
$(call cmd,merge_fragments,$1,$2)
19
12
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
20
13
endef
21
14
···
25
22
#
26
23
# Input config fragments without '.config' suffix
27
24
define merge_into_defconfig_override
28
-
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
29
-
-Q -m -O $(objtree) $(srctree)/arch/$(SRCARCH)/configs/$(1) \
30
-
$(foreach config,$(2),$(srctree)/arch/$(SRCARCH)/configs/$(config).config)
25
+
$(call cmd,merge_fragments,$1,$2,-Q)
31
26
+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
32
27
endef
+3
-1
scripts/kconfig/Makefile
+3
-1
scripts/kconfig/Makefile
···
105
105
all-config-fragments = $(call configfiles,*.config)
106
106
config-fragments = $(call configfiles,$@)
107
107
108
+
cmd_merge_fragments = $(srctree)/scripts/kconfig/merge_config.sh -m $(KCONFIG_CONFIG) $(config-fragments)
109
+
108
110
%.config: $(obj)/conf
109
111
$(if $(config-fragments),, $(error $@ fragment does not exists on this architecture))
110
-
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m $(KCONFIG_CONFIG) $(config-fragments)
112
+
$(call cmd,merge_fragments)
111
113
$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
112
114
113
115
PHONY += tinyconfig