From: Masahiro Yamada Date: Tue, 4 Jun 2019 18:14:53 +0000 (+0900) Subject: kconfig: run olddefconfig instead of oldconfig after merging fragments X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3266c806dc8692e079768ee2814498dcd6a91e61;p=linux.git kconfig: run olddefconfig instead of oldconfig after merging fragments 'make olddefconfig' is non-interactive, so we can drop 'yes'. The behavior is equivalent. Signed-off-by: Masahiro Yamada --- diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ab30fe724c43c..7656e1137b6be 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -94,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c %.config: $(obj)/conf $(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh -m .config $(configfiles) - +$(Q)yes "" | $(MAKE) -f $(srctree)/Makefile oldconfig + $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig PHONY += kvmconfig kvmconfig: kvm_guest.config