mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-01 09:09:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

kbuild: deb-pkg: Don't fail if modules.order is missing

Browse source 
Kernels built without CONFIG_MODULES might still want to create -dbg deb
packages but install_linux_image_dbg() assumes modules.order always
exists. This obviously isn't true if no modules were built, so we should
skip reading modules.order in that case.

Fixes: 16c36f8864 ("kbuild: deb-pkg: use build ID instead of debug link for dbg package")
Signed-off-by: Matt Fleming <mfleming@cloudflare.com>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
Matt Fleming 2024-11-07 15:05:08 +00:00 committed by Masahiro Yamada
parent dbefa1f31a
commit bcbbf493f2
1 changed files with 11 additions and 9 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

20
scripts/package/builddeb
View file

@ -96,16 +96,18 @@ install_linux_image_dbg () {
# Parse modules.order directly because 'make modules_install' may sign, # Parse modules.order directly because 'make modules_install' may sign,
# compress modules, and then run unneeded depmod. # compress modules, and then run unneeded depmod.
while read -r mod; do if is_enabled CONFIG_MODULES; then
mod="${mod%.o}.ko" while read -r mod; do
dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}" mod="${mod%.o}.ko"
buildid=$("${READELF}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p') dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"
link="${pdir}/usr/lib/debug/.build-id/${buildid}.debug" buildid=$("${READELF}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')
link="${pdir}/usr/lib/debug/.build-id/${buildid}.debug"
mkdir -p "${dbg%/*}" "${link%/*}" mkdir -p "${dbg%/*}" "${link%/*}"
"${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}" "${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"
ln -sf --relative "${dbg}" "${link}" ln -sf --relative "${dbg}" "${link}"
done < modules.order done < modules.order
fi
# Build debug package # Build debug package
# Different tools want the image in different locations # Different tools want the image in different locations