Commit 1240dabe authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: b611daae ("kbuild: deb-pkg: split image and debug objects staging out into functions")
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 4243afdb

scripts/package/builddeb

+4 −8
Original line number Diff line number Diff line
@@ -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



	# 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"