| Message ID | 20190304165732.24043-3-ar@cs.msu.ru |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | kbuild: More KCONFIG_CONFIG ignorance | expand |
On Tue, Mar 5, 2019 at 1:58 AM Arseny Maslennikov <ar@cs.msu.ru> 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. > > Signed-off-by: Arseny Maslennikov <ar@cs.msu.ru> > --- > Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index d5713e7b1e50..4d8760166a47 100644 > --- a/Makefile > +++ b/Makefile > @@ -1199,9 +1199,9 @@ kselftest-clean: > > PHONY += kselftest-merge > kselftest-merge: > - $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) > + $(if $(wildcard $(objtree)/$(KCONFIG_CONFIG)),, $(error No $(KCONFIG_CONFIG) exists, config your kernel first!)) > $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ > - -m $(objtree)/.config \ > + -m $(objtree)/$(KCONFIG_CONFIG) \ You are blindly replacing .config with $(KCONFIG_CONFIG). What kind of usage do you assume for KCONFIG_CONFIG ? $(objtree)/$(KCONFIG_CONFIG) means $(KCONFIG_CONFIG) never becomes an absolute path. > $(srctree)/tools/testing/selftests/*/config > +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig > > -- > 2.20.1 > -- Best Regards Masahiro Yamada
diff --git a/Makefile b/Makefile index d5713e7b1e50..4d8760166a47 100644 --- a/Makefile +++ b/Makefile @@ -1199,9 +1199,9 @@ kselftest-clean: PHONY += kselftest-merge kselftest-merge: - $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) + $(if $(wildcard $(objtree)/$(KCONFIG_CONFIG)),, $(error No $(KCONFIG_CONFIG) exists, config your kernel first!)) $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ - -m $(objtree)/.config \ + -m $(objtree)/$(KCONFIG_CONFIG) \ $(srctree)/tools/testing/selftests/*/config +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
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. Signed-off-by: Arseny Maslennikov <ar@cs.msu.ru> --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)