c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildsys: switch to automatic debug packages

Browse Source 
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@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2021-06-17 15:52:12 +02:00 committed by Fabian Grünbichler
parent 33bcc36963
commit 1cd71b3b73
3 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -7,22 +7,27 @@ ZFSDIR=zfs-linux_${ZFSVER}
ZFSSRC=upstream ZFSSRC=upstream
ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
ZFS_DEB2= \
ZFS_DEB_BINARY = \
libpam-zfs_${ZFSPKGVER}_amd64.deb \ libpam-zfs_${ZFSPKGVER}_amd64.deb \
libuutil3linux_${ZFSPKGVER}_amd64.deb \ libuutil3linux_${ZFSPKGVER}_amd64.deb \
libzfs4linux_${ZFSPKGVER}_amd64.deb \ libzfs4linux_${ZFSPKGVER}_amd64.deb \
libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb \ libzfsbootenv1linux_${ZFSPKGVER}_amd64.deb \
libzfslinux-dev_${ZFSPKGVER}_amd64.deb \
libzpool4linux_${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 \ zfs-test_${ZFSPKGVER}_amd64.deb \
zfsutils-linux_${ZFSPKGVER}_amd64.deb \ zfsutils-linux_${ZFSPKGVER}_amd64.deb \
zfs-zed_${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 ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
all: deb all: deb

19
debian/control vendored
View File

@ -247,25 +247,6 @@ Description: OpenZFS test infrastructure and support scripts
testing and validating a system using OpenZFS. It is entirely optional testing and validating a system using OpenZFS. It is entirely optional
and should only be installed and used in test environments. 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 Package: spl
Section: contrib/metapackages Section: contrib/metapackages
Architecture: all Architecture: all

2
debian/rules vendored
View File

@ -92,7 +92,7 @@ override_dh_makeshlibs:
dh_makeshlibs -a -V dh_makeshlibs -a -V
override_dh_strip: override_dh_strip:
dh_strip --dbg-package=zfs-dbg dh_strip --dbgsym-migration='zfs-dbg (<< 2.0.4~)'
override_dh_auto_clean: override_dh_auto_clean:
find . -name .gitignore -delete find . -name .gitignore -delete