p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2019-06-05 03:14:53 +09:00
parent b74c0cad3d
commit 3266c806dc
1 changed files with 1 additions and 1 deletions
scripts/kconfig
Makefile

2
scripts/kconfig/Makefile
View File

@ -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