[debhelper-devel] [debhelper] 01/01: dh_strip: Don't create dbgsym root for udebs

Niels Thykier nthykier at moszumanska.debian.org
Sun Feb 21 07:57:01 UTC 2016


This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 741040825fe29d7f6e5d6a1b119c61c527545b7e
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Feb 21 07:55:18 2016 +0000

    dh_strip: Don't create dbgsym root for udebs
    
    This ensures we do not collect build-ids for the udeb at all (unless
    it actually contains debug symbols).
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 4 ++++
 dh_gencontrol    | 5 +----
 dh_strip         | 7 +++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b98f4a..68ebf0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ debhelper (9.20160116) UNRELEASED; urgency=medium
   * Remove dh_suidregister and related autoscripts.  No package
     (that can be built in unstable) invokes this tool.
   * dh: Do not create stamp files when running with --no-act.
+  * dh_strip/dh_gencontrol: Move "is_udeb" guard to dh_strip.
+    This should avoid adding build-ids to udebs without having
+    the actual debug symbols available.  Thanks to Jérémy Bobbio
+    for reporting the issue.  (Closes: #812879)
 
  -- Niels Thykier <niels at thykier.net>  Sat, 16 Jan 2016 13:23:00 +0000
 
diff --git a/dh_gencontrol b/dh_gencontrol
index 0b92fd5..bde389d 100755
--- a/dh_gencontrol
+++ b/dh_gencontrol
@@ -85,10 +85,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		$build_ids = read_dbgsym_build_ids($dbgsym_info_dir);
 	}
 
-	# Temporary workaround: Do not build dbgsym packages for udebs as
-	# dpkg-gencontrol and dpkg-deb does not agree on the file
-	# extension.
-	if ( -d $dbgsym_tmp and not is_udeb($package)) {
+	if ( -d $dbgsym_tmp) {
 		my $multiarch = package_multiarch($package);
 		my $section = package_section($package);
 		my $replaces = read_dbgsym_migration($dbgsym_info_dir);
diff --git a/dh_strip b/dh_strip
index ee84d11..752176e 100755
--- a/dh_strip
+++ b/dh_strip
@@ -318,10 +318,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			$debugtmp=tmpdir($package."-dbg");
 		}
 	}
-	if ($dh{ENABLE_DBGSYM} and not $keep_debug and package_arch($package) ne 'all') {
+	# Temporary workaround: Do not build dbgsym packages for udebs as
+	# dpkg-gencontrol and dpkg-deb does not agree on the file
+	# extension.
+	if ($dh{ENABLE_DBGSYM} and not $keep_debug and package_arch($package) ne 'all' and not is_udeb($package)) {
 		# Avoid creating a dbgsym that would clash with a registered
 		# package or looks like a manual -dbg package.
-		if (!$all_packages{"${package}-dbgsym"} or $package =~ m/-dbg$/) {
+		if (not $all_packages{"${package}-dbgsym"} or $package =~ m/-dbg$/) {
 			$debugtmp = "debian/.debhelper/${package}/dbgsym-root";
 			$keep_debug = 1;
 			$use_build_id = 2;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git




More information about the debhelper-devel mailing list