Commit 3266c806 authored by Masahiro Yamada's avatar Masahiro Yamada

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent b74c0cad
...@@ -94,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c ...@@ -94,7 +94,7 @@ configfiles=$(wildcard $(srctree)/kernel/configs/$@ $(srctree)/arch/$(SRCARCH)/c
%.config: $(obj)/conf %.config: $(obj)/conf
$(if $(call configfiles),, $(error No configuration exists for this target on this architecture)) $(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)$(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 PHONY += kvmconfig
kvmconfig: kvm_guest.config kvmconfig: kvm_guest.config
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment