Re: [PATCH] kbuild: deb-pkg: Include modules.builtin* even if non-modular

[Nicolas Schier]

On Fri 09 Jun 2023 17:28:09 GMT, Josh Triplett 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.

Searching via source.debian.org, I was suprised that there are really 
numerous other tools as well, that attempt to read modules.builtin.

> 
> Install modules.builtin and modules.builtin.modinfo into the linux-image
> package even for a non-modular kernel.
> 
> Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx>
> ---

Thanks!

Reviewed-by: Nicolas Schier <nicolas@xxxxxxxxx>
Tested-by: Nicolas Schier <nicolas@xxxxxxxxx>

>  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

-- 
Nicolas Schier

Attachment: signature.asc
Description: PGP signature