kbuild: deb-pkg: remove the CONFIG_MODULES check in buildeb

[ Upstream commit 1240dabe8d58b4eff09e7edf1560da0360f997aa ]

When CONFIG_MODULES is disabled for ARCH=um, 'make (bin)deb-pkg' fails
with an error like follows:

  cp: cannot create regular file 'debian/linux-image/usr/lib/uml/modules/6.4.0-rc2+/System.map': No such file or directory

Remove the CONFIG_MODULES check completely so ${pdir}/usr/lib/uml/modules
will always be created and modules.builtin.(modinfo) will be installed
under it for ARCH=um.

Fixes: b611daae5efc ("kbuild: deb-pkg: split image and debug objects staging out into functions")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 07087ca68fe4b653c576919c290c6998796f9cbd..a0af4c0f971cab5b97b585a7847ce313e14d0908 100755 (executable)
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -63,17 +63,13 @@ install_linux_image () {
        fi
 
        ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install
-       if is_enabled CONFIG_MODULES; then
-               rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build"
-               rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source"
-               if [ "${SRCARCH}" = um ] ; then
-                       mkdir -p "${pdir}/usr/lib/uml/modules"
-                       mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}"
-               fi
-       fi
+       rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build"
+       rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source"
 
        # Install the kernel
        if [ "${ARCH}" = um ] ; then
+               mkdir -p "${pdir}/usr/lib/uml/modules"
+               mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}"
                mkdir -p "${pdir}/usr/bin" "${pdir}/usr/share/doc/${pname}"
                cp System.map "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}/System.map"
                cp ${KCONFIG_CONFIG} "${pdir}/usr/share/doc/${pname}/config"