On Tue, Mar 5, 2019 at 1:58 AM Arseny Maslennikov <ar@xxxxxxxxx> wrote: > > If the config file is reassigned through the KCONFIG_CONFIG > makeflag/envvar, this rule still attempts to use the wrong, possibly > nonexistent file. > Let's fix that. Are you just replacing .config with KCONFIG_CONFIG at random? scripts/kconfig/streamline_config.pl hard-codes the .config path, so this does not work anyway. > Signed-off-by: Arseny Maslennikov <ar@xxxxxxxxx> > --- > scripts/kconfig/Makefile | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile > index 1c7ac07def4d..28be91964a20 100644 > --- a/scripts/kconfig/Makefile > +++ b/scripts/kconfig/Makefile > @@ -44,14 +44,14 @@ build_xconfig: $(obj)/qconf > > localyesconfig localmodconfig: $(obj)/conf > $(Q)perl $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config > - $(Q)if [ -f .config ]; then \ > - cmp -s .tmp.config .config || \ > - (mv -f .config .config.old.1; \ > - mv -f .tmp.config .config; \ > + $(Q)if [ -f $(KCONFIG_CONFIG) ]; then \ > + cmp -s .tmp.config $(KCONFIG_CONFIG) || \ > + (mv -f $(KCONFIG_CONFIG) .tmp.config.old.1; \ > + mv -f .tmp.config $(KCONFIG_CONFIG); \ > $< $(silent) --oldconfig $(Kconfig); \ > - mv -f .config.old.1 .config.old) \ > + mv -f .tmp.config.old.1 $(KCONFIG_CONFIG).old) \ > else \ > - mv -f .tmp.config .config; \ > + mv -f .tmp.config $(KCONFIG_CONFIG); \ > $< $(silent) --oldconfig $(Kconfig); \ > fi > $(Q)rm -f .tmp.config > -- > 2.20.1 > -- Best Regards Masahiro Yamada
