kbuild: deb-pkg: Don't fail if modules.order is missing
PATCH v2 1/1 kbuild: deb-pkg: Don't fail if modules.order is missing
From: Matt Fleming <[email protected]>
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.
--- scripts/package/builddeb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
scripts/package/builddeb +6 -1
@@ -96,6 +96,11 @@ install_linux_image_dbg () { # Parse modules.order directly because 'make modules_install' may sign, # compress modules, and then run unneeded depmod. + modules_file=modules.order + if [ ! -s $modules_file ]; then + modules_file=/dev/null + fi + while read -r mod; do mod="${mod%.o}.ko" dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"
@@ -105,7 +110,7 @@ install_linux_image_dbg () { mkdir -p "${dbg%/*}" "${link%/*}" "${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}" ln -sf --relative "${dbg}" "${link}" - done < modules.order + done < $modules_file # Build debug package # Different tools want the image in different locations
Signature · 1 line
2.34.1
Quoted 7 lines · Matt Fleming
From: Matt Fleming <[email protected]>
Kernels built without
CONFIG_MODULESmight still want to create -dbg deb packages butinstall_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.
Good catch.
Quoted 13 lines
Fixes 16c36f8864e3 ("kbuild: deb-pkg: use build ID instead of debug link for dbg package")Cc Masahiro Yamada <[email protected]>Signed-off-by Matt Fleming <[email protected]>--- scripts/package/builddeb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)scripts/package/builddeb +0
-0
scripts/package/builddeb install_linux_image_dbg () { · line 102
Quoted 7 lines
scripts/package/builddeb +4
-0@@ -96,6 +96,11 @@ install_linux_image_dbg () { # Parse modules.order directly because 'make modules_install' may sign, # compress modules, and then run unneeded depmod. + modules_file=modules.order + if [ ! -s $modules_file ]; then + modules_file=/dev/null + fi
This leaves a possibility to pick up a stale modules.order in incremental builds without 'make clean'.
(1) build with CONFIG_MODULES=y
(2) disable CONFIG_MODULES
(3) 'make bindeb-pkg'
(3) picks up an unrelated modules.order
in the previous build (1).
scripts/package/builddeb install_linux_image_dbg () { · line 113
Quoted 9 lines
scripts/package/builddeb +1
-1while read -r mod; do mod="${mod%.o}.ko" dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"@@ -105,7 +110,7 @@ install_linux_image_dbg () { mkdir -p "${dbg%/*}" "${link%/*}" "${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}" ln -sf --relative "${dbg}" "${link}" - done < modules.order + done < $modules_file
Please enclose this block with CONFIG_MODULES.
if is_enabled CONFIG_MODULES; then
while read -r mod; do
...
done < modules.order
fi
Signature · 2 lines
Best Regards Masahiro Yamada