Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <cover.1689681454.git.msuchanek@suse.de> <20230718120348.383-1-msuchanek@suse.de>
In-Reply-To: <20230718120348.383-1-msuchanek@suse.de>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Tue, 18 Jul 2023 21:14:24 +0900
Message-ID: <CAK7LNAQopEkzYH9_urDxU9i060GDgtXYWWxTsRikxfYxxLCOxQ@mail.gmail.com>
Subject: Re: [PATCH v5] depmod: Handle installing modules under a prefix
To:     Michal Suchanek <msuchanek@suse.de>
Cc:     linux-modules@vger.kernel.org, Takashi Iwai <tiwai@suse.com>,
        Lucas De Marchi <lucas.de.marchi@gmail.com>,
        =?UTF-8?Q?Michal_Koutn=C3=BD?= <mkoutny@suse.com>,
        Jiri Slaby <jslaby@suse.com>, Jan Engelhardt <jengelh@inai.de>,
        Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Nicolas Schier <nicolas@fjasle.eu>,
        linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Tue, Jul 18, 2023 at 9:03=E2=80=AFPM Michal Suchanek <msuchanek@suse.de>=
 wrote:
>
> Some distributions aim at shipping all files in /usr.
>
> The path under which kernel modules are installed is hardcoded to /lib
> which conflicts with this goal.
>
> When kmod provides the config command, use it to determine the correct
> module installation path.
>
> With kmod that does not provide the config command /lib/modules is used
> as before.
>
> Signed-off-by: Michal Suchanek <msuchanek@suse.de>
> ---
> v2: Avoid error on systems with kmod that does not support config
> command
> v3: More verbose commit message
> v4:
>   - Document jq requirement
>   - fix bashism
>   - Update to getting full module path, not just additional prefix
> v5: switch to pkgconfig
> ---
>  Makefile          | 4 +++-
>  scripts/depmod.sh | 8 ++++----
>  2 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 47690c28456a..1620d224ad9c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1165,7 +1165,9 @@ export INSTALL_DTBS_PATH ?=3D $(INSTALL_PATH)/dtbs/=
$(KERNELRELEASE)
>  # makefile but the argument can be passed to make if needed.
>  #
>
> -MODLIB =3D $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
> +export KERNEL_MODULE_DIRECTORY :=3D $(shell pkg-config --print-variables=
 kmod 2>/dev/null | grep '^module_directory$$' >/dev/null && pkg-config --v=
ariable=3Dmodule_directory kmod || echo /lib/modules)

As I replied in another thread, Kbuild already provides
the max flexibility.

Please do not send this any more. NACK.


> +
> +MODLIB =3D $(INSTALL_MOD_PATH)$(KERNEL_MODULE_DIRECTORY)/$(KERNELRELEASE=
)
>  export MODLIB
>
>  PHONY +=3D prepare0
> diff --git a/scripts/depmod.sh b/scripts/depmod.sh
> index 3643b4f896ed..06961f990fcb 100755
> --- a/scripts/depmod.sh
> +++ b/scripts/depmod.sh
> @@ -27,16 +27,16 @@ fi
>  # numbers, so we cheat with a symlink here
>  depmod_hack_needed=3Dtrue
>  tmp_dir=3D$(mktemp -d ${TMPDIR:-/tmp}/depmod.XXXXXX)
> -mkdir -p "$tmp_dir/lib/modules/$KERNELRELEASE"
> +mkdir -p "$tmp_dir$KERNEL_MODULE_DIRECTORY/$KERNELRELEASE"
>  if "$DEPMOD" -b "$tmp_dir" $KERNELRELEASE 2>/dev/null; then
> -       if test -e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep" -o \
> -               -e "$tmp_dir/lib/modules/$KERNELRELEASE/modules.dep.bin";=
 then
> +       if test -e "$tmp_dir$KERNEL_MODULE_DIRECTORY/$KERNELRELEASE/modul=
es.dep" -o \
> +               -e "$tmp_dir$KERNEL_MODULE_DIRECTORY/$KERNELRELEASE/modul=
es.dep.bin"; then
>                 depmod_hack_needed=3Dfalse
>         fi
>  fi
>  rm -rf "$tmp_dir"
>  if $depmod_hack_needed; then
> -       symlink=3D"$INSTALL_MOD_PATH/lib/modules/99.98.$KERNELRELEASE"
> +       symlink=3D"$INSTALL_MOD_PATH$KERNEL_MODULE_DIRECTORY/99.98.$KERNE=
LRELEASE"
>         ln -s "$KERNELRELEASE" "$symlink"
>         KERNELRELEASE=3D99.98.$KERNELRELEASE
>  fi
> --
> 2.41.0
>


--=20
Best Regards
Masahiro Yamada