bump version to 2.0.3-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
buildsys: validate ABI at build time
2021-02-25 13:06:16 +01:00 · 2021-02-25 12:11:15 +01:00 · 2021-02-25 12:11:15 +01:00 · 2021-02-25 12:11:15 +01:00 · 2021-02-25 12:11:15 +01:00
20 changed files with 53 additions and 43 deletions
@@ -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		\
@@ -1,3 +1,9 @@
+zfs-linux (2.0.3-pve2) pve pmg; urgency=medium
+
+  * match package names to the ones used by Debian
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 25 Feb 2021 13:06:07 +0100
+
 zfs-linux (2.0.3-pve1) pve pmg; urgency=medium

  * buildsys: make libpam-zfs a separate package
@@ -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,
@@ -21,12 +22,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 +45,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 +65,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 +96,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 +105,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 +245,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 +257,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
@@ -1 +0,0 @@
-libnvpair2linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
@@ -1 +0,0 @@
-libuutil2linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
@@ -1 +0,0 @@
-libzfs3linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
@@ -1 +0,0 @@
-libzpool3linux: package-name-doesnt-match-sonames
@@ -0,0 +1 @@
+package-name-doesnt-match-sonames
@@ -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 \
@@ -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.

@@ -84,13 +90,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
@@ -101,9 +100,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:
Author	SHA1	Message	Date
Thomas Lamprecht	363c009381	bump version to 2.0.3-pve2 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>	2021-02-25 13:06:16 +01:00
Stoiko Ivanov	6967bf4185	buildsys: validate ABI at build time 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>	2021-02-25 12:11:15 +01:00
Stoiko Ivanov	c8ca652406	d/rules: drop unneeded UDEB conditionals we don't build or ship udebs Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-25 12:11:15 +01:00
Stoiko Ivanov	29e1ddcc26	d/rules: cosmetic cleanups minimize diff with d.o. Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>	2021-02-25 12:11:15 +01:00
Stoiko Ivanov	00fad03966	d/control: match package names to debian-upstream 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>	2021-02-25 12:11:15 +01:00
				`@@ -1 +0,0 @@`
				`libnvpair2linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libuutil2linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libzfs3linux: package-name-doesnt-match-sonames`
				`@@ -1 +0,0 @@`
				`libzpool3linux: package-name-doesnt-match-sonames`