[pve-devel] [PATCH zfsonlinux 05/16] buildsys: switch to automatic debug packages

[Stoiko Ivanov]

automatically generated -dbgsym packages has become the default
(see dh_strip(1) and [0]).
While we have no direct need to migrate, it helps in avoiding
debhelper bug 939164 (see [1]), when migrating to debhelper-compat 12.
(alternative option would be to depend on debhelper from backports, or
to skip dh_dwz).

The change is well described in dh_strip(1).

[0] https://wiki.debian.org/AutomaticDebugPackages
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=939164
Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 Makefile       | 21 +++++++++++++--------
 debian/control | 19 -------------------
 debian/rules   |  2 +-
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index 6c1f642c..5c42aed2 100644
--- a/Makefile
+++ b/Makefile
@@ -7,22 +7,27 @@ ZFSDIR=zfs-linux_${ZFSVER}
 ZFSSRC=upstream
 
 ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
-ZFS_DEB2= 					\
+
+ZFS_DEB_BINARY =				\
 libpam-zfs_${ZFSPKGVER}_amd64.deb		\
 libuutil3linux_${ZFSPKGVER}_amd64.deb		\
 libzfs4linux_${ZFSPKGVER}_amd64.deb		\
 libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb	\
-libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
 libzpool4linux_${ZFSPKGVER}_amd64.deb		\
-zfs-dbg_${ZFSPKGVER}_amd64.deb			\
-python3-pyzfs_${ZFSPKGVER}_amd64.deb		\
-pyzfs-doc_${ZFSPKGVER}_all.deb			\
-spl_${ZFSPKGVER}_all.deb			\
-zfs-initramfs_${ZFSPKGVER}_all.deb		\
 zfs-test_${ZFSPKGVER}_amd64.deb			\
 zfsutils-linux_${ZFSPKGVER}_amd64.deb		\
 zfs-zed_${ZFSPKGVER}_amd64.deb
-ZFS_DEBS= ${ZFS_DEB1} ${ZFS_DEB2}
+
+ZFS_DBG_DEBS = $(patsubst %_${ZFSPKGVER}_amd64.deb, %-dbgsym_${ZFSPKGVER}_amd64.deb, ${ZFS_DEB1} ${ZFS_DEB_BINARY})
+
+ZFS_DEB2= ${ZFS_DEB_BINARY}			\
+libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
+python3-pyzfs_${ZFSPKGVER}_amd64.deb		\
+pyzfs-doc_${ZFSPKGVER}_all.deb			\
+spl_${ZFSPKGVER}_all.deb			\
+zfs-initramfs_${ZFSPKGVER}_all.deb
+ZFS_DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
+
 ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
 
 all: deb
diff --git a/debian/control b/debian/control
index 6a6b2169..3828a9fb 100644
--- a/debian/control
+++ b/debian/control
@@ -247,25 +247,6 @@ Description: OpenZFS test infrastructure and support scripts
  testing and validating a system using OpenZFS. It is entirely optional
  and should only be installed and used in test environments.
 
-Package: zfs-dbg
-Section: contrib/debug
-Priority: optional
-Architecture: linux-any
-Depends: libnvpair3linux (= ${binary:Version}),
-         libuutil3linux (= ${binary:Version}),
-         libzfs4linux (= ${binary:Version}),
-         libzpool4linux (= ${binary:Version}),
-         zfs-zed (= ${binary:Version}),
-         zfsutils-linux (= ${binary:Version}),
-         ${misc:Depends}
-Description: Debugging symbols for OpenZFS userland libraries and tools
- OpenZFS is a storage platform that encompasses the functionality of
- traditional filesystems and volume managers. It supports data checksums,
- compression, encryption, snapshots, and more.
- .
- This package contains the debugging symbols for libzpool4linux, libzfs4linux,
- libnvpair3linux, libuutil3linux, zfs-zed and zfsutils-linux.
-
 Package: spl
 Section: contrib/metapackages
 Architecture: all
diff --git a/debian/rules b/debian/rules
index 836e4bc4..e5166882 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,7 +92,7 @@ override_dh_makeshlibs:
 	dh_makeshlibs -a -V
 
 override_dh_strip:
-	dh_strip --dbg-package=zfs-dbg
+	dh_strip --dbgsym-migration='zfs-dbg (<< 2.0.4~)'
 
 override_dh_auto_clean:
 	find . -name .gitignore -delete
-- 
2.20.1