[kernel] r21825 - in dists/sid/linux/debian: . patches patches/bugfix/all

[Ben Hutchings]

Author: benh
Date: Fri Sep 12 14:20:46 2014
New Revision: 21825

Log:
builddeb: put the dbg files into the correct directory

Added:
   dists/sid/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch
Modified:
   dists/sid/linux/debian/changelog
   dists/sid/linux/debian/patches/series

Modified: dists/sid/linux/debian/changelog
==============================================================================
--- dists/sid/linux/debian/changelog	Fri Sep 12 14:20:16 2014	(r21824)
+++ dists/sid/linux/debian/changelog	Fri Sep 12 14:20:46 2014	(r21825)
@@ -61,6 +61,7 @@
   * udeb: Add ath6kl_sdio, libertas_cs, libertas_sdio, mwifiex_sdio,
     r8192u_usb, r8723au, rtl8188eu, rtl818x_pci, rtl8723be, rtl8821ae,
     spectrum_cs to nic-wireless-modules
+  * builddeb: put the dbg files into the correct directory
 
   [ Ian Campbell ]
   * [armel/orion5x] udeb: Include mvmdio in nic-modules udeb.

Added: dists/sid/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch	Fri Sep 12 14:20:46 2014	(r21825)
@@ -0,0 +1,52 @@
+From: Michal Marek <mmarek at suse.cz>
+Date: Fri, 22 Aug 2014 15:51:03 +0200
+Subject: builddeb: put the dbg files into the correct directory
+Origin: https://git.kernel.org/cgit/linux/kernel/git/mmarek/kbuild.git//commit?id=2d0871396995139b37f9ceb153c8b07589148343
+
+Since the conversion of objtree to use relative pathnames (commit
+7e1c04779e, "kbuild: Use relative path for $(objtree)"), the debug
+info files have been ending up in /debian/dbgtmp/ in the regular
+linux-image package instead of the debug files package. Fix up the
+paths so that the debug files end up in the -dbg package.
+
+This is based on a similar patch by Darrick.
+
+Reported-and-tested-by: "Darrick J. Wong" <darrick.wong at oracle.com>
+Signed-off-by: Michal Marek <mmarek at suse.cz>
+---
+ scripts/package/builddeb | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 35d5a58..7c0e6e4 100644
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -152,18 +152,16 @@ 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 $(find $tmpdir/lib/modules/ -name *.ko -printf '%P\n'); do
++			module=lib/modules/$module
++			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
+ 

Modified: dists/sid/linux/debian/patches/series
==============================================================================
--- dists/sid/linux/debian/patches/series	Fri Sep 12 14:20:16 2014	(r21824)
+++ dists/sid/linux/debian/patches/series	Fri Sep 12 14:20:46 2014	(r21825)
@@ -107,6 +107,7 @@
 bugfix/all/mnt-Add-tests-for-unprivileged-remount-cases-that-ha.patch
 debian/i2o-disable-i2o_ext_adaptec-on-64bit.patch
 bugfix/all/aic94xx-remove-broken-fallback-for-missing-ctrl-a.patch
+bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch
 
 # Miscellaneous features
 features/all/efi-autoload-efivars.patch