On Fri, May 17, 2024 at 1:32 PM Kris Van Hees <kris.van.h...@oracle.com> wrote: > > When CONFIG_BUILTIN_MODULE_RANGES is enabled, the modules.builtin.ranges > file should be installed in the module install location. > > Signed-off-by: Kris Van Hees <kris.van.h...@oracle.com> > Reviewed-by: Nick Alcock <nick.alc...@oracle.com> > --- > Changes since v2: > - Include modules.builtin.ranges in modules install target > --- > scripts/Makefile.modinst | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/scripts/Makefile.modinst b/scripts/Makefile.modinst > index 0afd75472679f..f5160ddd74239 100644 > --- a/scripts/Makefile.modinst > +++ b/scripts/Makefile.modinst > @@ -30,10 +30,10 @@ $(MODLIB)/modules.order: modules.order FORCE > quiet_cmd_install_modorder = INSTALL $@ > cmd_install_modorder = sed 's:^\(.*\)\.o$$:kernel/\1.ko:' $< > $@ > > -# Install modules.builtin(.modinfo) even when CONFIG_MODULES is disabled. > -install-y += $(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo) > +# Install modules.builtin(.modinfo,.ranges) even when CONFIG_MODULES is > disabled. > +install-y += $(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo > modules.builtin.ranges)
This will break modules_install when CONFIG_BUILTIN_MODULE_RANGES is disabled. modules.builtin.ranges should be added to install-y conditionally, like this: # Install modules.builtin(.modinfo) even when CONFIG_MODULES is disabled. install-y += $(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo) install-$(CONFIG_BUILTIN_MODULE_RANGES) += $(MODLIB)/modules.builtin.ranges > -$(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo): > $(MODLIB)/%: % FORCE > +$(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo > modules.builtin.ranges): $(MODLIB)/%: % FORCE > $(call cmd,install) > > endif > -- > 2.43.0 > -- Best Regards Masahiro Yamada
