Received-SPF: pass (google.com: domain of linux-kernel+bounces-183523-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
MIME-Version: 1.0
References: <20240517042839.544650-1-kris.van.hees@oracle.com> <20240517042839.544650-7-kris.van.hees@oracle.com>
In-Reply-To: <20240517042839.544650-7-kris.van.hees@oracle.com>
From: Masahiro Yamada <masahiroy@kernel.org>
Date: Mon, 20 May 2024 18:10:14 +0900
Message-ID: <CAK7LNAQPN34CK0co+nX83e84fcK_JrSyEJAdwEJZ5uVBvTKUyg@mail.gmail.com>
Subject: Re: [PATCH v3 6/6] module: add install target for modules.builtin.ranges
To: Kris Van Hees <kris.van.hees@oracle.com>
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, 
	linux-modules@vger.kernel.org, linux-trace-kernel@vger.kernel.org, 
	Nick Alcock <nick.alcock@oracle.com>, Steven Rostedt <rostedt@goodmis.org>, 
	Luis Chamberlain <mcgrof@kernel.org>, Masami Hiramatsu <mhiramat@kernel.org>, 
	Nick Desaulniers <ndesaulniers@google.com>, Jiri Olsa <olsajiri@gmail.com>, 
	Elena Zannoni <elena.zannoni@oracle.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Fri, May 17, 2024 at 1:32=E2=80=AFPM Kris Van Hees <kris.van.hees@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.hees@oracle.com>
> Reviewed-by: Nick Alcock <nick.alcock@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 =3D INSTALL $@
>        cmd_install_modorder =3D sed 's:^\(.*\)\.o$$:kernel/\1.ko:' $< > $=
@
>
> -# Install modules.builtin(.modinfo) even when CONFIG_MODULES is disabled=
.
> -install-y +=3D $(addprefix $(MODLIB)/, modules.builtin modules.builtin.m=
odinfo)
> +# Install modules.builtin(.modinfo,.ranges) even when CONFIG_MODULES is =
disabled.
> +install-y +=3D $(addprefix $(MODLIB)/, modules.builtin modules.builtin.m=
odinfo 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 +=3D $(addprefix $(MODLIB)/, modules.builtin modules.builtin.modi=
nfo)

install-$(CONFIG_BUILTIN_MODULE_RANGES) +=3D $(MODLIB)/modules.builtin.rang=
es


> -$(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo): $(MODL=
IB)/%: % FORCE
> +$(addprefix $(MODLIB)/, modules.builtin modules.builtin.modinfo modules.=
builtin.ranges): $(MODLIB)/%: % FORCE
>         $(call cmd,install)
>
>  endif
> --
> 2.43.0
>


--
Best Regards
Masahiro Yamada