Skip to content

Commit bcbbf49

Browse files
mflemingmasahir0y
authored andcommitted
kbuild: deb-pkg: Don't fail if modules.order is missing
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: 16c36f8 ("kbuild: deb-pkg: use build ID instead of debug link for dbg package") Signed-off-by: Matt Fleming <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent dbefa1f commit bcbbf49

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

scripts/package/builddeb

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,18 @@ install_linux_image_dbg () {
9696

9797
# Parse modules.order directly because 'make modules_install' may sign,
9898
# compress modules, and then run unneeded depmod.
99-
while read -r mod; do
100-
mod="${mod%.o}.ko"
101-
dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"
102-
buildid=$("${READELF}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')
103-
link="${pdir}/usr/lib/debug/.build-id/${buildid}.debug"
104-
105-
mkdir -p "${dbg%/*}" "${link%/*}"
106-
"${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"
107-
ln -sf --relative "${dbg}" "${link}"
108-
done < modules.order
99+
if is_enabled CONFIG_MODULES; then
100+
while read -r mod; do
101+
mod="${mod%.o}.ko"
102+
dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"
103+
buildid=$("${READELF}" -n "${mod}" | sed -n 's@^.*Build ID: \(..\)\(.*\)@\1/\2@p')
104+
link="${pdir}/usr/lib/debug/.build-id/${buildid}.debug"
105+
106+
mkdir -p "${dbg%/*}" "${link%/*}"
107+
"${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"
108+
ln -sf --relative "${dbg}" "${link}"
109+
done < modules.order
110+
fi
109111

110112
# Build debug package
111113
# Different tools want the image in different locations

0 commit comments

Comments
 (0)