diff options
author | Niels Thykier <niels@thykier.net> | 2019-08-06 15:05:50 +0000 |
---|---|---|
committer | Niels Thykier <niels@thykier.net> | 2019-08-06 15:05:50 +0000 |
commit | 67f50881f41c71df2dff8991e1767a6325e90649 (patch) | |
tree | bc8fb5ce439b0d6af0b2c3aeac409a1465884346 | |
parent | cc50a4c743d2d92b8280bccbce495b88cb3d86ea (diff) | |
download | debhelper-67f50881f41c71df2dff8991e1767a6325e90649.tar.gz |
dh_dwz: Skip multifile for udeb packages
Signed-off-by: Niels Thykier <niels@thykier.net>
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dh_dwz | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 0f683d63..8d1d065c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ debhelper (12.2.5) UNRELEASED; urgency=medium but succeeds anyway by default. The previous behaviour of insisting on a multifile can be obtained by explicitly passing --dwz-multifile. (Closes: #933541) + * dh_dwz: Skip multifile generation for udeb packages. + (Closes: #933212) -- Niels Thykier <niels@thykier.net> Sun, 21 Jul 2019 18:40:38 +0000 @@ -49,6 +49,10 @@ please pass B<--no-dwz-multifile> to work around the issue. The generated multifile will be compressed with B<objcopy --compress-debug-sections>. +Note for B<udeb> packages: B<dh_dwz> will never generate multifiles +for B<udeb> packages. It will still use B<dwz> to reduce the +file size of debug files if it finds any. + =item B<-X>I<item>, B<--exclude=>I<item> Exclude files that contain I<item> anywhere in their filename from being @@ -120,7 +124,7 @@ for my $package (@{$dh{DOPACKAGES}}) { # Consistent order; @elf_files = sort(@elf_files); my ($unique_files, $hardlinks) = find_hardlinks(@elf_files); - if ($create_multifile and @{$unique_files} > 1) { + if ($create_multifile and @{$unique_files} > 1 and not is_udeb($package)) { my $objcopy = cross_command($package, 'objcopy'); my $ma_dir = dpkg_architecture_value('DEB_HOST_MULTIARCH'); my $dwz_dir = "usr/lib/debug/.dwz/${ma_dir}"; |