Skip to content

Commit 1240dab

Browse files
committed
kbuild: deb-pkg: remove the CONFIG_MODULES check in buildeb
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: b611daa ("kbuild: deb-pkg: split image and debug objects staging out into functions") Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
1 parent 4243afd commit 1240dab

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

scripts/package/builddeb

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,13 @@ install_linux_image () {
6363
fi
6464

6565
${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install
66-
if is_enabled CONFIG_MODULES; then
67-
rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build"
68-
rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source"
69-
if [ "${SRCARCH}" = um ] ; then
70-
mkdir -p "${pdir}/usr/lib/uml/modules"
71-
mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}"
72-
fi
73-
fi
66+
rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build"
67+
rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source"
7468

7569
# Install the kernel
7670
if [ "${ARCH}" = um ] ; then
71+
mkdir -p "${pdir}/usr/lib/uml/modules"
72+
mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}"
7773
mkdir -p "${pdir}/usr/bin" "${pdir}/usr/share/doc/${pname}"
7874
cp System.map "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}/System.map"
7975
cp ${KCONFIG_CONFIG} "${pdir}/usr/share/doc/${pname}/config"

0 commit comments

Comments
 (0)