diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-06-05 03:14:53 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-07-17 10:25:10 +0900 |
| commit | 3266c806dc8692e079768ee2814498dcd6a91e61 (patch) | |
| tree | 5971fbdfa0a4a97d25bc1766d9c02628ef77da84 /scripts | |
| parent | b74c0cad3d5f4f2252f1a42e160dc0e202e88e93 (diff) | |
| download | linux-3266c806dc8692e079768ee2814498dcd6a91e61.tar.gz linux-3266c806dc8692e079768ee2814498dcd6a91e61.tar.bz2 linux-3266c806dc8692e079768ee2814498dcd6a91e61.zip | |
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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index ab30fe724c43..7656e1137b6b 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 |