History

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.

Masahiro Yamada committed 3 years ago

Commit 1240dab1 parent 4243afd1 file · +4 −8Browse files

Unified · Split

scripts/package/builddeb+4−8
@@ -63,17 +63,13 @@ install_linux_image () { · 62 unmodified lines
63 fi63 fi
64 64
65 ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install65 ${MAKE} -f ${srctree}/Makefile INSTALL_MOD_PATH="${pdir}" modules_install
66 if is_enabled CONFIG_MODULES; then66 rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build"
67 rm -f "${pdir}/lib/modules/${KERNELRELEASE}/build"67 rm -f "${pdir}/lib/modules/${KERNELRELEASE}/source"
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
74 68
75 # Install the kernel69 # Install the kernel
76 if [ "${ARCH}" = um ] ; then70 if [ "${ARCH}" = um ] ; then
71 mkdir -p "${pdir}/usr/lib/uml/modules"
72 mv "${pdir}/lib/modules/${KERNELRELEASE}" "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}"
77 mkdir -p "${pdir}/usr/bin" "${pdir}/usr/share/doc/${pname}"73 mkdir -p "${pdir}/usr/bin" "${pdir}/usr/share/doc/${pname}"
78 cp System.map "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}/System.map"74 cp System.map "${pdir}/usr/lib/uml/modules/${KERNELRELEASE}/System.map"
79 cp ${KCONFIG_CONFIG} "${pdir}/usr/share/doc/${pname}/config"75 cp ${KCONFIG_CONFIG} "${pdir}/usr/share/doc/${pname}/config"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t