On Fri, Nov 18, 2022 at 5:47 AM Nicolas Schier <nicolas@xxxxxxxxx> wrote: > > On Sun, 13 Nov 2022 20:15:23 +0900 Masahiro Yamada wrote: > > While building, installing, cleaning, Kbuild visits sub-directories > > and includes 'Kbuild' or 'Makefile' that exists there. > > > > Add 'kbuild-file' macro, and reuse it from scripts/Makefie.* > > > > Signed-off-by: Masahiro Yamada <masahiroy@xxxxxxxxxx> > > --- > > > > scripts/Kbuild.include | 5 +++++ > > scripts/Makefile.asm-generic | 6 +++--- > > scripts/Makefile.build | 6 +----- > > scripts/Makefile.clean | 5 +---- > > scripts/Makefile.dtbinst | 2 +- > > 5 files changed, 11 insertions(+), 13 deletions(-) > > > > diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include > > index 2bc08ace38a3..cbe28744637b 100644 > > --- a/scripts/Kbuild.include > > +++ b/scripts/Kbuild.include > > @@ -40,6 +40,11 @@ escsq = $(subst $(squote),'\$(squote)',$1) > > # Quote a string to pass it to C files. foo => '"foo"' > > stringify = $(squote)$(quote)$1$(quote)$(squote) > > > > +### > > +# The path to Kbuild or Makefile. Kbuild has precedence over Makefile. > > +kbuild-dir = $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) > > +kbuild-file = $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile) > > + > > ### > > # Easy method for doing a status message > > kecho := : > > diff --git a/scripts/Makefile.asm-generic b/scripts/Makefile.asm-generic > > index 1d501c57f9ef..8d01b37b7677 100644 > > --- a/scripts/Makefile.asm-generic > > +++ b/scripts/Makefile.asm-generic > > @@ -10,15 +10,15 @@ PHONY := all > > all: > > > > src := $(subst /generated,,$(obj)) > > --include $(src)/Kbuild > > + > > +include $(srctree)/scripts/Kbuild.include > > +-include $(kbuild-file) > > > > # $(generic)/Kbuild lists mandatory-y. Exclude um since it is a special case. > > ifneq ($(SRCARCH),um) > > include $(srctree)/$(generic)/Kbuild > > endif > > > > -include $(srctree)/scripts/Kbuild.include > > - > > redundant := $(filter $(mandatory-y) $(generated-y), $(generic-y)) > > redundant += $(foreach f, $(generic-y), $(if $(wildcard $(srctree)/$(src)/$(f)),$(f))) > > redundant := $(sort $(redundant)) > > diff --git a/scripts/Makefile.build b/scripts/Makefile.build > > index 41f3602fc8de..37cf88d076e8 100644 > > --- a/scripts/Makefile.build > > +++ b/scripts/Makefile.build > > @@ -38,11 +38,7 @@ subdir-ccflags-y := > > > > include $(srctree)/scripts/Kbuild.include > > include $(srctree)/scripts/Makefile.compiler > > - > > -# The filename Kbuild has precedence over Makefile > > -kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) > > -include $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile) > > - > > +include $(kbuild-file) > > include $(srctree)/scripts/Makefile.lib > > > > # Do not include hostprogs rules unless needed. > > diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean > > index 878cec648959..3649900696dd 100644 > > --- a/scripts/Makefile.clean > > +++ b/scripts/Makefile.clean > > @@ -9,10 +9,7 @@ PHONY := __clean > > __clean: > > > > include $(srctree)/scripts/Kbuild.include > > - > > -# The filename Kbuild has precedence over Makefile > > -kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src)) > > -include $(or $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Makefile) > > +include $(kbuild-file) > > > > # Figure out what we need to build from the various variables > > # ========================================================================== > > diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst > > index 190d781e84f4..2ab936e4179d 100644 > > --- a/scripts/Makefile.dtbinst > > +++ b/scripts/Makefile.dtbinst > > @@ -15,7 +15,7 @@ __dtbs_install: > > > > include include/config/auto.conf > > include $(srctree)/scripts/Kbuild.include > > -include $(src)/Makefile > > +include $(kbuild-file) > > > > dtbs := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-))) > > subdirs := $(addprefix $(obj)/, $(subdir-y) $(subdir-m)) > > -- > > 2.34.1 > > Reviewed-by: Nicolas Schier <nicolas@xxxxxxxxx> > > What do you think about using $(kbuild-file) also in Makefile.modpost? Yes, we can replace it as well. I will fix it. Thanks for the close review, as always! > > diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost > --- a/scripts/Makefile.modpost > +++ b/scripts/Makefile.modpost > @@ -93,7 +93,7 @@ obj := $(KBUILD_EXTMOD) > src := $(obj) > > # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS > -include $(or $(wildcard $(src)/Kbuild), $(src)/Makefile) > +include $(kbuild-file) > > module.symvers-if-present := $(wildcard Module.symvers) > output-symdump := $(KBUILD_EXTMOD)/Module.symvers > > > Kind regards, > Nicolas > > -- > epost|xmpp: nicolas@xxxxxxxxx irc://oftc.net/nsc > ↳ gpg: 18ed 52db e34f 860e e9fb c82b 7d97 0932 55a0 ce7f > -- frykten for herren er opphav til kunnskap -- -- Best Regards Masahiro Yamada
