| Message ID | f7e9220aad3d98bd174f7dcbd68031e1e15ea968.1687461492.git.josh@joshtriplett.org |
|---|---|
| State | New |
| Headers | show |
| Series | kbuild: builddeb: always make modules_install, to install modules.builtin* | expand |
On Thu, Jun 22, 2023 at 12:19:53PM -0700 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. > > Now that `make modules_install` works even in non-modular kernels and > installs these files, unconditionally invoke it when building a Debian > package. > > Signed-off-by: Josh Triplett <josh@joshtriplett.org> > --- thanks! Reviewed-by: Nicolas Schier <nicolas@fjasle.eu> > This patch depends on > https://lore.kernel.org/lkml/20230615111743.883891-1-masahiroy@kernel.org/ > > scripts/package/builddeb | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/package/builddeb b/scripts/package/builddeb > index 252faaa5561c..f500e3910158 100755 > --- a/scripts/package/builddeb > +++ b/scripts/package/builddeb > @@ -62,8 +62,8 @@ install_linux_image () { > ${MAKE} -f ${srctree}/Makefile INSTALL_DTBS_PATH="${pdir}/usr/lib/linux-image-${KERNELRELEASE}" dtbs_install > fi > > + ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install > if is_enabled CONFIG_MODULES; then > - ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install > rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build" > rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source" > if [ "${SRCARCH}" = um ] ; then > -- > 2.40.1
On Fri, Jun 23, 2023 at 4:20 AM Josh Triplett <josh@joshtriplett.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. > > Now that `make modules_install` works even in non-modular kernels and > installs these files, unconditionally invoke it when building a Debian > package. > > Signed-off-by: Josh Triplett <josh@joshtriplett.org> > --- Applied to linux-kbuild. Thanks. What I meant in my previous reply was to remove "if is_enabled CONFIG_MODULES; then" Anyway, I did it by myself in a follow-up patch. https://lore.kernel.org/linux-kbuild/20230625181623.2473308-1-masahiroy@kernel.org/T/#u
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 252faaa5561c..f500e3910158 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -62,8 +62,8 @@ install_linux_image () { ${MAKE} -f ${srctree}/Makefile INSTALL_DTBS_PATH="${pdir}/usr/lib/linux-image-${KERNELRELEASE}" dtbs_install fi + ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install if is_enabled CONFIG_MODULES; then - ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build" rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source" if [ "${SRCARCH}" = um ] ; then
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. Now that `make modules_install` works even in non-modular kernels and installs these files, unconditionally invoke it when building a Debian package. Signed-off-by: Josh Triplett <josh@joshtriplett.org> --- This patch depends on https://lore.kernel.org/lkml/20230615111743.883891-1-masahiroy@kernel.org/ scripts/package/builddeb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)