[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAK7LNAQ1bfc_rEX-Wyi6az0KSse11ws-farvxkYwfGKXrueduw@mail.gmail.com>
Date: Thu, 15 Jun 2023 20:22:39 +0900
From: Masahiro Yamada <masahiroy@...nel.org>
To: Josh Triplett <josh@...htriplett.org>
Cc: Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <ndesaulniers@...gle.com>,
Nicolas Schier <nicolas@...sle.eu>,
linux-kbuild@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] kbuild: deb-pkg: Include modules.builtin* even if non-modular
On Sat, Jun 10, 2023 at 9:28 AM Josh Triplett <josh@...htriplett.org> wrote:
>
> Even for a non-modular kernel, the kernel builds modules.builtin and
> modules.builtin.modinfo, with information about the built-in modules.
> Tools such as initramfs-tools need these files to build a working
> initramfs on some systems, such as those requiring firmware.
>
> Install modules.builtin and modules.builtin.modinfo into the linux-image
> package even for a non-modular kernel.
>
> Signed-off-by: Josh Triplett <josh@...htriplett.org>
OK, I understood.
But, this patch only aids Debian in an ad-hoc file copy.
I think chaning modules_install would be a more
general solution.
Can you use this patch as a prerequisite?
https://patchwork.kernel.org/project/linux-kbuild/patch/20230615111743.883891-1-masahiroy@kernel.org/
Then, you can simply remove
"if is_enabled CONFIG_MODULES; then"
so you can install the files unconditionally.
> ---
> scripts/package/builddeb | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index 252faaa5561c..91261529f2c7 100755
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -70,6 +70,12 @@ install_linux_image () {
> mkdir -p "${pdir}/usr/lib/uml/modules"
> mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}"
> fi
> + elif [ -f modules.builtin ]; then
> + mkdir -p "${pdir}/lib/modules/${KERNELRELEASE}"
> + cp modules.builtin "${pdir}/lib/modules/${KERNELRELEASE}/modules.builtin"
> + if [ -f modules.builtin.modinfo ]; then
> + cp modules.builtin.modinfo "${pdir}/lib/modules/${KERNELRELEASE}/modules.builtin.modinfo"
> + fi
> fi
>
> # Install the kernel
> --
> 2.40.1
>
--
Best Regards
Masahiro Yamada
Powered by blists - more mailing lists