Skip to contentSkip to conversation

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

PATCH In review Matt Fleming 2 participants 2 messages Nov 7, 2024 – Nov 9, 2024 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH v3 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.

Fixes 16c36f8864e3 ("kbuild: deb-pkg: use build ID instead of debug link for dbg package")
Cc Masahiro Yamada <[email protected]>

---

Changes in v3:
- Wrap modules.order logic in 'if is_enabled CONFIG_MODULES'

 scripts/package/builddeb | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
scripts/package/builddeb +12 -10
index 441b0bb66e0d..fb686fd3266f 100755
@@ -96,16 +96,18 @@ install_linux_image_dbg () {
 
 	# Parse modules.order directly because 'make modules_install' may sign,
 	# compress modules, and then run unneeded depmod.
-	while read -r mod; do
-		mod="${mod%.o}.ko"
-		dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"
-		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%/*}"
-		"${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"
-		ln -sf --relative "${dbg}" "${link}"
-	done < modules.order
+	if is_enabled CONFIG_MODULES; then
+		while read -r mod; do
+			mod="${mod%.o}.ko"
+			dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"
+			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%/*}"
+			"${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"
+			ln -sf --relative "${dbg}" "${link}"
+		done < modules.order
+	fi
 
 	# Build debug package
 	# Different tools want the image in different locations
Signature · 1 line
2.34.1
#1 lore raw
Quoted 8 lines · Matt Fleming

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.

Quoted 4 lines
Fixes 16c36f8864e3 ("kbuild: deb-pkg: use build ID instead of debug link for dbg package")
Cc Masahiro Yamada <[email protected]>

Applied to linux-kbuild.
Thanks!

Quoted 44 lines

---

Changes in v3:
- Wrap modules.order logic in 'if is_enabled CONFIG_MODULES'

 scripts/package/builddeb | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)
scripts/package/builddeb +12 -11
index 441b0bb66e0d..fb686fd3266f 100755
@@ -96,16 +96,18 @@ install_linux_image_dbg () {
 
        # Parse modules.order directly because 'make modules_install' may sign,
        # compress modules, and then run unneeded depmod.
-       while read -r mod; do
-               mod="${mod%.o}.ko"
-               dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"
-               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%/*}"
-               "${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"
-               ln -sf --relative "${dbg}" "${link}"
-       done < modules.order
+       if is_enabled CONFIG_MODULES; then
+               while read -r mod; do
+                       mod="${mod%.o}.ko"
+                       dbg="${pdir}/usr/lib/debug/lib/modules/${KERNELRELEASE}/kernel/${mod}"
+                       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%/*}"
+                       "${OBJCOPY}" --only-keep-debug "${mod}" "${dbg}"
+                       ln -sf --relative "${dbg}" "${link}"
+               done < modules.order
+       fi
 
        # Build debug package
        # Different tools want the image in different locations
--

2.34.1

Signature · 2 lines
Best Regards
Masahiro Yamada