| From 0c62a478449cd80db7818b4820ac3020cd3d269b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 26 Jun 2023 03:16:23 +0900 |
| Subject: kbuild: deb-pkg: remove the CONFIG_MODULES check in buildeb |
| |
| From: Masahiro Yamada <masahiroy@kernel.org> |
| |
| [ 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> |
| --- |
| scripts/package/builddeb | 12 ++++-------- |
| 1 file changed, 4 insertions(+), 8 deletions(-) |
| |
| diff --git a/scripts/package/builddeb b/scripts/package/builddeb |
| index 07087ca68fe4b..a0af4c0f971ca 100755 |
| --- 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" |
| -- |
| 2.39.2 |
| |
