From a3b4639c8561421404ed385dc5e1e071464c2045 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Fri, 12 Sep 2014 14:20:46 +0000 Subject: [PATCH] builddeb: put the dbg files into the correct directory svn path=/dists/sid/linux/; revision=21825 --- debian/changelog | 1 + ...-dbg-files-into-the-correct-director.patch | 52 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 54 insertions(+) create mode 100644 debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch diff --git a/debian/changelog b/debian/changelog index 07c18b210..b749d16c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,7 @@ linux (3.16.2-3) UNRELEASED; urgency=medium * 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. diff --git a/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch b/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch new file mode 100644 index 000000000..e259e41ba --- /dev/null +++ b/debian/patches/bugfix/all/builddeb-put-the-dbg-files-into-the-correct-director.patch @@ -0,0 +1,52 @@ +From: Michal Marek +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" +Signed-off-by: Michal Marek +--- + 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 + diff --git a/debian/patches/series b/debian/patches/series index 9a8ba25d6..9a8ba0416 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -107,6 +107,7 @@ bugfix/all/mnt-Change-the-default-remount-atime-from-relatime-t.patch 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