diff mbox

deb-pkg: Another fix for relative paths.

Message ID 20141010174943.GQ19800@derobert.net (mailing list archive)
State New, archived
Headers show

Commit Message

Anthony DeRobertis Oct. 10, 2014, 5:49 p.m. UTC 
Similar to a765a7ce293aa0a072728790ce11088b2f7030e2, the -dbg package
build did a cd, breaking relative paths. This resulted in the debug
symbols being part of the kernel image package and further installed
under /debian instead of /.

Signed-off-by: Anthony DeRobertis <anthony@derobert.net>
---
 scripts/package/builddeb | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

Comments

Michal Marek Oct. 10, 2014, 10:55 p.m. UTC | #1 
Dne 10.10.2014 v 19:49 Anthony DeRobertis napsal(a):
> 
> Similar to a765a7ce293aa0a072728790ce11088b2f7030e2, the -dbg package
> build did a cd, breaking relative paths. This resulted in the debug
> symbols being part of the kernel image package and further installed
> under /debian instead of /.

Linux-next has a fix already: 2d087139 (builddeb: put the dbg files into
the correct directory).

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 35d5a58..e6d70d8 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -152,18 +152,15 @@  if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
 		rmdir "$tmpdir/lib/modules/$version"
 	fi
 	if [ -n "$BUILD_DEBUG" ] ; then
-		(
-			cd $tmpdir
-			for module in $(find lib/modules/ -name *.ko); do
-				mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
-				# only keep debug symbols in the debug file
-				$OBJCOPY --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
-				# strip original module from debug symbols
-				$OBJCOPY --strip-debug $module
-				# then add a link to those
-				$OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
-			done
-		)
+		for module in $(cd $tmpdir && find lib/modules/ -name *.ko); do
+			mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
+			# only keep debug symbols in the debug file
+			$OBJCOPY --only-keep-debug $tmpdir/$module $dbg_dir/usr/lib/debug/$module
+			# strip original module from debug symbols
+			$OBJCOPY --strip-debug $tmpdir/$module
+			# then add a link to those
+			$OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $tmpdir/$module
+		done
 	fi
 fi