| Message ID | 20190604181453.30422-1-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 3266c806dc8692e079768ee2814498dcd6a91e61 |
| Headers | show |
| Series | kconfig: run olddefconfig instead of oldconfig after merging fragments | expand |
On Wed, Jun 5, 2019 at 3:15 AM Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > > 'make olddefconfig' is non-interactive, so we can drop 'yes'. > The behavior is equivalent. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- Applied to linux-kbuild/kconfig. > > scripts/kconfig/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > 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 > -- > 2.17.1 > -- Best Regards Masahiro Yamada
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
'make olddefconfig' is non-interactive, so we can drop 'yes'. The behavior is equivalent. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- scripts/kconfig/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1