[pve-devel] [PATCH zfsonlinux 0/4] match library package names with d.o. and minor cleanups

[pve-devel] [PATCH zfsonlinux 0/4] match library package names with d.o. and minor cleanups

[Stoiko Ivanov]

I noticed that debian.org ships differently named packages for the zfs
libraries. I overlooked the change from e.g. libnvpair2 to libnvpair3
during the zfs-2.0.0 preparation somehow - sorry!

In order to not cause even more confusion (by being the only distro that
ships libnvpair2linux) the first patch aligns our package names with d.o

the remaining patches are mostly cosmetic cleanups picked up while diffing
d/rules with upstream. The added checkabi test seemed quick enough and
potentially worth it.

Stoiko Ivanov (4):
  d/control: match package names to debian-upstream
  d/rules: cosmetic cleanups minimize diff with d.o.
  d/rules: drop unneeded UDEB conditionals
  buildsys: validate ABI at build time

 Makefile                                      |  8 +--
 debian/control                                | 53 ++++++++++---------
 debian/libnvpair2linux.lintian-overrides      |  1 -
 ...nvpair2linux.docs => libnvpair3linux.docs} |  0
 ....install.in => libnvpair3linux.install.in} |  0
 debian/libnvpair3linux.lintian-overrides      |  1 +
 debian/libuutil2linux.lintian-overrides       |  1 -
 ...ibuutil2linux.docs => libuutil3linux.docs} |  0
 ...x.install.in => libuutil3linux.install.in} |  0
 debian/libuutil3linux.lintian-overrides       |  1 +
 debian/libzfs3linux.lintian-overrides         |  1 -
 .../{libzfs3linux.docs => libzfs4linux.docs}  |  0
 ...nux.install.in => libzfs4linux.install.in} |  0
 debian/libzfs4linux.lintian-overrides         |  1 +
 debian/libzpool3linux.lintian-overrides       |  1 -
 ...ibzpool3linux.docs => libzpool4linux.docs} |  0
 ...x.install.in => libzpool4linux.install.in} |  0
 debian/libzpool4linux.lintian-overrides       |  1 +
 debian/rules                                  | 21 ++++----
 19 files changed, 47 insertions(+), 43 deletions(-)
 delete mode 100644 debian/libnvpair2linux.lintian-overrides
 rename debian/{libnvpair2linux.docs => libnvpair3linux.docs} (100%)
 rename debian/{libnvpair2linux.install.in => libnvpair3linux.install.in} (100%)
 create mode 100644 debian/libnvpair3linux.lintian-overrides
 delete mode 100644 debian/libuutil2linux.lintian-overrides
 rename debian/{libuutil2linux.docs => libuutil3linux.docs} (100%)
 rename debian/{libuutil2linux.install.in => libuutil3linux.install.in} (100%)
 create mode 100644 debian/libuutil3linux.lintian-overrides
 delete mode 100644 debian/libzfs3linux.lintian-overrides
 rename debian/{libzfs3linux.docs => libzfs4linux.docs} (100%)
 rename debian/{libzfs3linux.install.in => libzfs4linux.install.in} (100%)
 create mode 100644 debian/libzfs4linux.lintian-overrides
 delete mode 100644 debian/libzpool3linux.lintian-overrides
 rename debian/{libzpool3linux.docs => libzpool4linux.docs} (100%)
 rename debian/{libzpool3linux.install.in => libzpool4linux.install.in} (100%)
 create mode 100644 debian/libzpool4linux.lintian-overrides

-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 1/4] d/control: match package names to debian-upstream

[Stoiko Ivanov]

during the tracking of zfs-2.0.x integration in debian upstream I did
not notice that the library packages got renamed yet another time (see
[0]) to match the soname version.
This patch renames our library packagenames to match debian upstream
and includes Breaks,Depends on the intermediate versions we shipped
with the zfs-2.0.3 release.

Noticed while checking an issue (with `aptitude` vs. `apt`) reported
on pve-user.
Tested on a VM running our latest packages and on one still running
zfs 0.8.5

[0] https://salsa.debian.org/zfsonlinux-team/zfs/-/commit/42ba750f8ca07625e9d58c14b46420768ab23c09

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 Makefile                                      |  8 +--
 debian/control                                | 50 ++++++++++---------
 debian/libnvpair2linux.lintian-overrides      |  1 -
 ...nvpair2linux.docs => libnvpair3linux.docs} |  0
 ....install.in => libnvpair3linux.install.in} |  0
 debian/libnvpair3linux.lintian-overrides      |  1 +
 debian/libuutil2linux.lintian-overrides       |  1 -
 ...ibuutil2linux.docs => libuutil3linux.docs} |  0
 ...x.install.in => libuutil3linux.install.in} |  0
 debian/libuutil3linux.lintian-overrides       |  1 +
 debian/libzfs3linux.lintian-overrides         |  1 -
 .../{libzfs3linux.docs => libzfs4linux.docs}  |  0
 ...nux.install.in => libzfs4linux.install.in} |  0
 debian/libzfs4linux.lintian-overrides         |  1 +
 debian/libzpool3linux.lintian-overrides       |  1 -
 ...ibzpool3linux.docs => libzpool4linux.docs} |  0
 ...x.install.in => libzpool4linux.install.in} |  0
 debian/libzpool4linux.lintian-overrides       |  1 +
 18 files changed, 34 insertions(+), 32 deletions(-)
 delete mode 100644 debian/libnvpair2linux.lintian-overrides
 rename debian/{libnvpair2linux.docs => libnvpair3linux.docs} (100%)
 rename debian/{libnvpair2linux.install.in => libnvpair3linux.install.in} (100%)
 create mode 100644 debian/libnvpair3linux.lintian-overrides
 delete mode 100644 debian/libuutil2linux.lintian-overrides
 rename debian/{libuutil2linux.docs => libuutil3linux.docs} (100%)
 rename debian/{libuutil2linux.install.in => libuutil3linux.install.in} (100%)
 create mode 100644 debian/libuutil3linux.lintian-overrides
 delete mode 100644 debian/libzfs3linux.lintian-overrides
 rename debian/{libzfs3linux.docs => libzfs4linux.docs} (100%)
 rename debian/{libzfs3linux.install.in => libzfs4linux.install.in} (100%)
 create mode 100644 debian/libzfs4linux.lintian-overrides
 delete mode 100644 debian/libzpool3linux.lintian-overrides
 rename debian/{libzpool3linux.docs => libzpool4linux.docs} (100%)
 rename debian/{libzpool3linux.install.in => libzpool4linux.install.in} (100%)
 create mode 100644 debian/libzpool4linux.lintian-overrides

diff --git a/Makefile b/Makefile
index e0dad3a6..bc168cda 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
 ZFSDIR=zfs-linux_${ZFSVER}
 ZFSSRC=upstream
 
-ZFS_DEB1= libnvpair2linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB1= libnvpair3linux_${ZFSPKGVER}_amd64.deb
 ZFS_DEB2= 					\
-libuutil2linux_${ZFSPKGVER}_amd64.deb		\
-libzfs3linux_${ZFSPKGVER}_amd64.deb		\
+libuutil3linux_${ZFSPKGVER}_amd64.deb		\
+libzfs4linux_${ZFSPKGVER}_amd64.deb		\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool3linux_${ZFSPKGVER}_amd64.deb		\
+libzpool4linux_${ZFSPKGVER}_amd64.deb		\
 zfs-dbg_${ZFSPKGVER}_amd64.deb			\
 zfs-zed_${ZFSPKGVER}_amd64.deb			\
 zfs-initramfs_${ZFSPKGVER}_all.deb		\
diff --git a/debian/control b/debian/control
index 096d4afe..4ab6bda4 100644
--- a/debian/control
+++ b/debian/control
@@ -21,12 +21,12 @@ Homepage: https://www.zfsonlinux.org/
 Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
 Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
 
-Package: libnvpair2linux
+Package: libnvpair3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libnvpair1, libnvpair1linux
-Replaces: libnvpair1, libnvpair1linux
+Breaks: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
+Replaces: libnvpair1, libnvpair1linux, libnvpair2linux, libnvpair3
 Description: Solaris name-value library for Linux
  This library provides routines for packing and unpacking nv pairs for
  transporting data across process boundaries, transporting between
@@ -44,12 +44,12 @@ Description: PAM module for managing encryption keys for ZFS
  This provides a Pluggable Authentication Module (PAM) that automatically
  unlocks encrypted ZFS datasets upon login.
 
-Package: libuutil2linux
+Package: libuutil3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libuutil1, libuutil1linux
-Replaces: libuutil1, libuutil1linux
+Breaks: libuutil1, libuutil1linux, libuutil2linux, libuutil3
+Replaces: libuutil1, libuutil1linux, libuutil2linux, libuutil3
 Description: Solaris userland utility library for Linux
  This library provides a variety of glue functions for ZFS on Linux:
   * libspl: The Solaris Porting Layer userland library, which provides APIs
@@ -64,26 +64,26 @@ Description: Solaris userland utility library for Linux
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
-Depends: libnvpair2linux (= ${binary:Version}),
-         libuutil2linux (= ${binary:Version}),
-         libzfs3linux (= ${binary:Version}),
+Depends: libnvpair3linux (= ${binary:Version}),
+         libuutil3linux (= ${binary:Version}),
+         libzfs4linux (= ${binary:Version}),
          libzfsbootenv1linux (= ${binary:Version}),
-         libzpool3linux (= ${binary:Version}),
+         libzpool4linux (= ${binary:Version}),
          ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
 Description: OpenZFS filesystem development files for Linux
  Header files and static libraries for compiling software against
  libraries of OpenZFS filesystem.
  .
- This package includes the development files of libnvpair2, libuutil2,
- libzpool3 and libzfs3.
+ This package includes the development files of libnvpair3, libuutil3,
+ libzpool4 and libzfs4.
 
-Package: libzfs3linux
+Package: libzfs4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2, libzfs2linux
-Replaces: libzfs2, libzfs2linux
+Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4
+Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4
 Description: OpenZFS filesystem library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -95,6 +95,8 @@ Package: libzfsbootenv1linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libzfs2, libzfs4
+Replaces: libzfs2, libzfs4
 Description: OpenZFS filesystem library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -102,12 +104,12 @@ Description: OpenZFS filesystem library for Linux
  .
  The zfsbootenv library provides support for modifying ZFS label information.
 
-Package: libzpool3linux
+Package: libzpool4linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2, libzpool2linux
-Replaces: libzpool2, libzpool2linux
+Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4
+Replaces: libzpool2, libzpool2linux, libzpool3linux, libzpool4
 Description: OpenZFS pool library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -242,10 +244,10 @@ Package: zfs-dbg
 Section: contrib/debug
 Priority: optional
 Architecture: linux-any
-Depends: libnvpair2linux (= ${binary:Version}),
-         libuutil2linux (= ${binary:Version}),
-         libzfs3linux (= ${binary:Version}),
-         libzpool3linux (= ${binary:Version}),
+Depends: libnvpair3linux (= ${binary:Version}),
+         libuutil3linux (= ${binary:Version}),
+         libzfs4linux (= ${binary:Version}),
+         libzpool4linux (= ${binary:Version}),
          zfs-zed (= ${binary:Version}),
          zfsutils-linux (= ${binary:Version}),
          ${misc:Depends}
@@ -254,8 +256,8 @@ Description: Debugging symbols for OpenZFS userland libraries and tools
  traditional filesystems and volume managers. It supports data checksums,
  compression, encryption, snapshots, and more.
  .
- This package contains the debugging symbols for libzpool3linux, libzfs3linux,
- libnvpair2linux, libuutil2linux, zfs-zed and zfsutils-linux.
+ This package contains the debugging symbols for libzpool4linux, libzfs4linux,
+ libnvpair3linux, libuutil3linux, zfs-zed and zfsutils-linux.
 
 Package: spl
 Section: contrib/metapackages
diff --git a/debian/libnvpair2linux.lintian-overrides b/debian/libnvpair2linux.lintian-overrides
deleted file mode 100644
index ad4f1dfa..00000000
--- a/debian/libnvpair2linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnvpair2linux: package-name-doesnt-match-sonames
diff --git a/debian/libnvpair2linux.docs b/debian/libnvpair3linux.docs
similarity index 100%
rename from debian/libnvpair2linux.docs
rename to debian/libnvpair3linux.docs
diff --git a/debian/libnvpair2linux.install.in b/debian/libnvpair3linux.install.in
similarity index 100%
rename from debian/libnvpair2linux.install.in
rename to debian/libnvpair3linux.install.in
diff --git a/debian/libnvpair3linux.lintian-overrides b/debian/libnvpair3linux.lintian-overrides
new file mode 100644
index 00000000..86759793
--- /dev/null
+++ b/debian/libnvpair3linux.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
diff --git a/debian/libuutil2linux.lintian-overrides b/debian/libuutil2linux.lintian-overrides
deleted file mode 100644
index 30f7d718..00000000
--- a/debian/libuutil2linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libuutil2linux: package-name-doesnt-match-sonames
diff --git a/debian/libuutil2linux.docs b/debian/libuutil3linux.docs
similarity index 100%
rename from debian/libuutil2linux.docs
rename to debian/libuutil3linux.docs
diff --git a/debian/libuutil2linux.install.in b/debian/libuutil3linux.install.in
similarity index 100%
rename from debian/libuutil2linux.install.in
rename to debian/libuutil3linux.install.in
diff --git a/debian/libuutil3linux.lintian-overrides b/debian/libuutil3linux.lintian-overrides
new file mode 100644
index 00000000..86759793
--- /dev/null
+++ b/debian/libuutil3linux.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
diff --git a/debian/libzfs3linux.lintian-overrides b/debian/libzfs3linux.lintian-overrides
deleted file mode 100644
index 0630b2dd..00000000
--- a/debian/libzfs3linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libzfs3linux: package-name-doesnt-match-sonames
diff --git a/debian/libzfs3linux.docs b/debian/libzfs4linux.docs
similarity index 100%
rename from debian/libzfs3linux.docs
rename to debian/libzfs4linux.docs
diff --git a/debian/libzfs3linux.install.in b/debian/libzfs4linux.install.in
similarity index 100%
rename from debian/libzfs3linux.install.in
rename to debian/libzfs4linux.install.in
diff --git a/debian/libzfs4linux.lintian-overrides b/debian/libzfs4linux.lintian-overrides
new file mode 100644
index 00000000..86759793
--- /dev/null
+++ b/debian/libzfs4linux.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
diff --git a/debian/libzpool3linux.lintian-overrides b/debian/libzpool3linux.lintian-overrides
deleted file mode 100644
index 09f8fa21..00000000
--- a/debian/libzpool3linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libzpool3linux: package-name-doesnt-match-sonames
diff --git a/debian/libzpool3linux.docs b/debian/libzpool4linux.docs
similarity index 100%
rename from debian/libzpool3linux.docs
rename to debian/libzpool4linux.docs
diff --git a/debian/libzpool3linux.install.in b/debian/libzpool4linux.install.in
similarity index 100%
rename from debian/libzpool3linux.install.in
rename to debian/libzpool4linux.install.in
diff --git a/debian/libzpool4linux.lintian-overrides b/debian/libzpool4linux.lintian-overrides
new file mode 100644
index 00000000..86759793
--- /dev/null
+++ b/debian/libzpool4linux.lintian-overrides
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 2/4] d/rules: cosmetic cleanups minimize diff with d.o.

[Stoiko Ivanov]

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/rules | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 932153d2..06100b8e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,13 +29,13 @@ override_dh_auto_configure:
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
 	  --libdir=/lib/"$(DEB_HOST_MULTIARCH)" \
-	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-udevdir=/lib/udev \
 	  --with-zfsexecdir=/usr/lib/zfs-linux \
 	  --enable-systemd \
 	  --enable-pyzfs \
 	  --with-python=python3 \
 	  --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \
+	  --with-pkgconfigdir='/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig' \
 	  --with-systemdunitdir=/lib/systemd/system \
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \
@@ -101,9 +101,11 @@ override_dh_auto_clean:
 	dh_auto_clean
 	@if test -e META.orig; then mv META.orig META; fi
 
+override_dh_install:
+	find debian/tmp/lib -name *.la -delete
+	dh_install
+
 override_dh_missing:
-	find . -name lib*.la -delete
-	rm debian/tmp/lib/$(DEB_HOST_MULTIARCH)/security/pam_zfs_key.la
 	dh_missing --fail-missing
 
 override_dh_installdocs:
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 3/4] d/rules: drop unneeded UDEB conditionals

[Stoiko Ivanov]

we don't build or ship udebs

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/rules | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index 06100b8e..fe09e2e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,13 +84,6 @@ override_dh_python3:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -a -V
-ifeq ($(BUILD_UDEB), true)
-	dh_makeshlibs -V -plibnvpair1linux
-	dh_makeshlibs -V -plibuutil1linux
-	dh_makeshlibs -V -plibzfs2linux
-	dh_makeshlibs -V -plibzpool2linux
-	dh_makeshlibs -V -pzfsutils-linux
-endif
 
 override_dh_strip:
 	dh_strip --dbg-package=zfs-dbg
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 4/4] buildsys: validate ABI at build time

[Stoiko Ivanov]

this commit follows: 93661343d884a5339631afd7b683e232d20b7baf and
0b52b09c6083bd590e46cb9884d06bae1b712a2a from debian-upstream [0].

the `make checkabi` invocation takes < .4s on my workstation - so it
seems worth the change.

[0] https://salsa.debian.org/zfsonlinux-team/zfs

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/control | 3 ++-
 debian/rules   | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 4ab6bda4..619244e9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,8 @@ Source: zfs-linux
 Section: contrib/kernel
 Priority: optional
 Maintainer: Proxmox Support Team <support@proxmox.com>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: abigail-tools,
+               debhelper (>= 10~),
                dh-python,
                libblkid-dev,
                libelf-dev,
diff --git a/debian/rules b/debian/rules
index fe09e2e1..836e4bc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,12 @@ override_dh_auto_configure:
 	done
 
 override_dh_auto_test:
+override_dh_auto_test:
+ifeq (amd64,$(DEB_HOST_ARCH))
+	# Upstream provides an ABI guarantee that we validate here
+	$(MAKE) checkabi
+endif
+
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
 
-- 
2.20.1

[pve-devel] applied-series: [PATCH zfsonlinux 0/4] match library package names with d.o. and minor cleanups

[Thomas Lamprecht]

On 24.02.21 22:07, Stoiko Ivanov wrote:
> I noticed that debian.org ships differently named packages for the zfs
> libraries. I overlooked the change from e.g. libnvpair2 to libnvpair3
> during the zfs-2.0.0 preparation somehow - sorry!
> 
> In order to not cause even more confusion (by being the only distro that
> ships libnvpair2linux) the first patch aligns our package names with d.o
> 
> the remaining patches are mostly cosmetic cleanups picked up while diffing
> d/rules with upstream. The added checkabi test seemed quick enough and
> potentially worth it.
> 
> Stoiko Ivanov (4):
>   d/control: match package names to debian-upstream
>   d/rules: cosmetic cleanups minimize diff with d.o.
>   d/rules: drop unneeded UDEB conditionals
>   buildsys: validate ABI at build time
> 

applied, thanks!