[pve-devel] [PATCH zfsonlinux/pve-kernel] ZFS 2.0.0 preview

[pve-devel] [PATCH zfsonlinux/pve-kernel] ZFS 2.0.0 preview

[Stoiko Ivanov]

The following patchset is meant as a first rc of our packaging for ZFS 2.0

for the greatest part I mirrored the merge request by Antonio Russo over
at salsa.d.o [0], and adapted where needed.

Another change, which was merged at debian, before the merge request, was
the placement of shared library files in arch-specific directories
(/lib/x86_64-linux-gnu/) - I added that here too.

Only minimally tested (upgrading an up to date PVE-6.3 (installed on top
of plain buster), and running `ztest -v 1 -s 32M -f /media/`)

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

zfsonlinux:
Antonio Russo (4):
  ship arcstat(1) manual page
  Add new zstream utility
  Include new zfs_ids_to_path tool
  Include new pam_zfs_key mechanism

Stoiko Ivanov (5):
  update submodule and patches for zfs-2.0.0
  Install files under multiarch directories
  Bump libz{fs,pool,uutil} soname version
  Manual pages were split into subpages
  package zfsbootenv library

 Makefile                                      |  8 +-
 debian/control                                | 60 ++++++++------
 debian/libnvpair1linux.install                |  1 -
 debian/libnvpair1linux.lintian-overrides      |  1 -
 ...nvpair1linux.docs => libnvpair2linux.docs} |  0
 debian/libnvpair2linux.install.in             |  1 +
 debian/libnvpair2linux.lintian-overrides      |  1 +
 debian/libuutil1linux.install                 |  1 -
 debian/libuutil1linux.lintian-overrides       |  1 -
 ...ibuutil1linux.docs => libuutil2linux.docs} |  0
 debian/libuutil2linux.install.in              |  1 +
 debian/libuutil2linux.lintian-overrides       |  1 +
 debian/libzfs2linux.install                   |  2 -
 debian/libzfs2linux.lintian-overrides         |  1 -
 .../{libzfs2linux.docs => libzfs3linux.docs}  |  0
 debian/libzfs3linux.install.in                |  2 +
 debian/libzfs3linux.lintian-overrides         |  1 +
 ...ol2linux.docs => libzfsbootenv1linux.docs} |  0
 debian/libzfsbootenv1linux.install            |  1 +
 debian/libzfsbootenv1linux.install.in         |  1 +
 debian/libzfsbootenv1linux.lintian-overrides  |  2 +
 debian/libzfslinux-dev.install                |  4 -
 debian/libzfslinux-dev.install.in             |  4 +
 debian/libzpool2linux.install                 |  1 -
 debian/libzpool2linux.lintian-overrides       |  1 -
 debian/libzpool3linux.docs                    |  2 +
 debian/libzpool3linux.install.in              |  1 +
 debian/libzpool3linux.lintian-overrides       |  1 +
 .../0002-always-load-ZFS-module-on-boot.patch |  8 +-
 ...o-the-zed-binary-on-the-systemd-unit.patch |  6 +-
 ...ith-d-dev-disk-by-id-in-scan-service.patch |  4 +-
 debian/patches/0005-Enable-zed-emails.patch   |  2 +-
 .../0006-dont-symlink-zed-scripts.patch       |  4 +-
 .../patches/0007-Use-installed-python3.patch  | 19 ++---
 ...md-unit-for-importing-specific-pools.patch | 20 ++---
 debian/rules                                  | 16 +++-
 debian/zfsutils-linux.install                 | 79 ++++++++++++++++++-
 upstream                                      |  2 +-
 38 files changed, 175 insertions(+), 85 deletions(-)
 delete mode 100644 debian/libnvpair1linux.install
 delete mode 100644 debian/libnvpair1linux.lintian-overrides
 rename debian/{libnvpair1linux.docs => libnvpair2linux.docs} (100%)
 create mode 100644 debian/libnvpair2linux.install.in
 create mode 100644 debian/libnvpair2linux.lintian-overrides
 delete mode 100644 debian/libuutil1linux.install
 delete mode 100644 debian/libuutil1linux.lintian-overrides
 rename debian/{libuutil1linux.docs => libuutil2linux.docs} (100%)
 create mode 100644 debian/libuutil2linux.install.in
 create mode 100644 debian/libuutil2linux.lintian-overrides
 delete mode 100644 debian/libzfs2linux.install
 delete mode 100644 debian/libzfs2linux.lintian-overrides
 rename debian/{libzfs2linux.docs => libzfs3linux.docs} (100%)
 create mode 100644 debian/libzfs3linux.install.in
 create mode 100644 debian/libzfs3linux.lintian-overrides
 rename debian/{libzpool2linux.docs => libzfsbootenv1linux.docs} (100%)
 create mode 100644 debian/libzfsbootenv1linux.install
 create mode 100644 debian/libzfsbootenv1linux.install.in
 create mode 100644 debian/libzfsbootenv1linux.lintian-overrides
 delete mode 100644 debian/libzfslinux-dev.install
 create mode 100644 debian/libzfslinux-dev.install.in
 delete mode 100644 debian/libzpool2linux.install
 delete mode 100644 debian/libzpool2linux.lintian-overrides
 create mode 100644 debian/libzpool3linux.docs
 create mode 100644 debian/libzpool3linux.install.in
 create mode 100644 debian/libzpool3linux.lintian-overrides

pve-kernel
Stoiko Ivanov (1):
  add zzstd.ko to zfs install

 debian/rules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.20.1

[pve-devel] [PATCH pve-kernel 1/1] add zzstd.ko to zfs install

[Stoiko Ivanov]

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

diff --git a/debian/rules b/debian/rules
index 7c4f9f6..48680f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,7 +128,7 @@ binary: install
 	${MAKE} -C ${KERNEL_SRC} INSTALL_MOD_PATH=${BUILD_DIR}/debian/${PVE_KERNEL_PKG}/ modules_install
 	# install zfs drivers
 	install -d -m 0755 debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
-	install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
+	install -m 644 $(addprefix ${MODULES}/,zfs.ko zavl.ko znvpair.ko zunicode.ko zcommon.ko icp.ko zlua.ko spl.ko zzstd.ko) debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME}/zfs
 	# remove firmware
 	rm -rf debian/${PVE_KERNEL_PKG}/lib/firmware
 	# strip debug info
@@ -243,6 +243,7 @@ ${MODULES}/zfs.ko: .compile_mark
 	cp ${MODULES}/${ZFSDIR}/module/zfs/zfs.ko ${MODULES}/
 	cp ${MODULES}/${ZFSDIR}/module/lua/zlua.ko ${MODULES}/
 	cp ${MODULES}/${ZFSDIR}/module/spl/spl.ko ${MODULES}/
+	cp ${MODULES}/${ZFSDIR}/module/zstd/zzstd.ko ${MODULES}/
 
 fwlist-${KVNAME}: .compile_mark .modules_compile_mark
 	debian/scripts/find-firmware.pl debian/${PVE_KERNEL_PKG}/lib/modules/${KVNAME} >fwlist.tmp
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 1/9] update submodule and patches for zfs-2.0.0

[Stoiko Ivanov]

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 .../0002-always-load-ZFS-module-on-boot.patch |  8 ++++----
 ...o-the-zed-binary-on-the-systemd-unit.patch |  6 +++---
 ...ith-d-dev-disk-by-id-in-scan-service.patch |  4 ++--
 debian/patches/0005-Enable-zed-emails.patch   |  2 +-
 .../0006-dont-symlink-zed-scripts.patch       |  4 ++--
 .../patches/0007-Use-installed-python3.patch  | 19 +++++++-----------
 ...md-unit-for-importing-specific-pools.patch | 20 ++++++-------------
 upstream                                      |  2 +-
 8 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/debian/patches/0002-always-load-ZFS-module-on-boot.patch b/debian/patches/0002-always-load-ZFS-module-on-boot.patch
index 2ff27f4f..6b1e068b 100644
--- a/debian/patches/0002-always-load-ZFS-module-on-boot.patch
+++ b/debian/patches/0002-always-load-ZFS-module-on-boot.patch
@@ -15,13 +15,13 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- etc/modules-load.d/zfs.conf.in | 2 +-
+ etc/modules-load.d/zfs.conf | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/etc/modules-load.d/zfs.conf.in b/etc/modules-load.d/zfs.conf.in
+diff --git a/etc/modules-load.d/zfs.conf b/etc/modules-load.d/zfs.conf
 index 44e1bb3ed..7509b03cb 100644
---- a/etc/modules-load.d/zfs.conf.in
-+++ b/etc/modules-load.d/zfs.conf.in
+--- a/etc/modules-load.d/zfs.conf
++++ b/etc/modules-load.d/zfs.conf
 @@ -1,3 +1,3 @@
  # The default behavior is to allow udev to load the kernel modules on demand.
  # Uncomment the following line to unconditionally load them at boot.
diff --git a/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
index bd794ac3..ebc1850b 100644
--- a/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
+++ b/debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch
@@ -13,11 +13,11 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/etc/systemd/system/zfs-zed.service.in b/etc/systemd/system/zfs-zed.service.in
-index f4313625e..444e776fd 100644
+index 008075138..570e27707 100644
 --- a/etc/systemd/system/zfs-zed.service.in
 +++ b/etc/systemd/system/zfs-zed.service.in
-@@ -3,7 +3,7 @@ Description=ZFS Event Daemon (zed)
- Documentation=man:zed(8)
+@@ -4,7 +4,7 @@ Documentation=man:zed(8)
+ ConditionPathIsDirectory=/sys/module/zfs
  
  [Service]
 -ExecStart=@sbindir@/zed -F
diff --git a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
index 4ad0db30..12dfde85 100644
--- a/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
+++ b/debian/patches/0004-import-with-d-dev-disk-by-id-in-scan-service.patch
@@ -14,10 +14,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/etc/systemd/system/zfs-import-scan.service.in b/etc/systemd/system/zfs-import-scan.service.in
-index 278f937fe..e8c502a33 100644
+index 6520f3246..1718f98a2 100644
 --- a/etc/systemd/system/zfs-import-scan.service.in
 +++ b/etc/systemd/system/zfs-import-scan.service.in
-@@ -12,7 +12,7 @@ ConditionPathExists=!@sysconfdir@/zfs/zpool.cache
+@@ -13,7 +13,7 @@ ConditionPathIsDirectory=/sys/module/zfs
  [Service]
  Type=oneshot
  RemainAfterExit=yes
diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch
index ffbd21d8..e837d7e9 100644
--- a/debian/patches/0005-Enable-zed-emails.patch
+++ b/debian/patches/0005-Enable-zed-emails.patch
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmd/zed/zed.d/zed.rc b/cmd/zed/zed.d/zed.rc
-index 0ef706849..50632bfcb 100644
+index df560f921..4ce7af744 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
 @@ -15,7 +15,7 @@
diff --git a/debian/patches/0006-dont-symlink-zed-scripts.patch b/debian/patches/0006-dont-symlink-zed-scripts.patch
index 921bab77..078f6d6d 100644
--- a/debian/patches/0006-dont-symlink-zed-scripts.patch
+++ b/debian/patches/0006-dont-symlink-zed-scripts.patch
@@ -16,10 +16,10 @@ Forwarded: no need
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/cmd/zed/zed.d/Makefile.am b/cmd/zed/zed.d/Makefile.am
-index 716db2b2f..57fed7fdf 100644
+index 8b2d0c200..118c96547 100644
 --- a/cmd/zed/zed.d/Makefile.am
 +++ b/cmd/zed/zed.d/Makefile.am
-@@ -52,6 +52,6 @@ install-data-hook:
+@@ -48,6 +48,6 @@ install-data-hook:
  	for f in $(zedconfdefaults); do \
  	  test -f "$(DESTDIR)$(zedconfdir)/$${f}" -o \
  	       -L "$(DESTDIR)$(zedconfdir)/$${f}" || \
diff --git a/debian/patches/0007-Use-installed-python3.patch b/debian/patches/0007-Use-installed-python3.patch
index 59769d63..789ce2ad 100644
--- a/debian/patches/0007-Use-installed-python3.patch
+++ b/debian/patches/0007-Use-installed-python3.patch
@@ -4,16 +4,11 @@ Date: Tue, 5 May 2020 22:15:16 -0600
 Subject: [PATCH] Use installed python3
 
 ---
- debian/patches/0004-prefer-python3-tests.patch              | 0
  .../functional/cli_root/zfs_program/zfs_program_json.ksh    | 6 +++---
  .../tests/functional/rsend/send_encrypted_files.ksh         | 2 +-
  .../tests/functional/rsend/send_realloc_dnode_size.ksh      | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
- create mode 100644 debian/patches/0004-prefer-python3-tests.patch
+ 3 files changed, 5 insertions(+), 5 deletions(-)
 
-diff --git a/debian/patches/0004-prefer-python3-tests.patch b/debian/patches/0004-prefer-python3-tests.patch
-new file mode 100644
-index 000000000..e69de29bb
 diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
 index 3788543b0..c7ee4ae9a 100755
 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
@@ -33,7 +28,7 @@ index 3788543b0..c7ee4ae9a 100755
  
  typeset -i cnt=0
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
-index 6288178f8..d4475b369 100755
+index f89cb3b31..375d483f7 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_files.ksh
 @@ -87,7 +87,7 @@ log_must xattrtest -f 10 -x 3 -s 32768 -r -k -p /$TESTPOOL/$TESTFS2/xattrsadir
@@ -42,19 +37,19 @@ index 6288178f8..d4475b369 100755
  log_must touch /$TESTPOOL/$TESTFS2/attrs
 -log_must eval "python -c 'print \"a\" * 4096' | \
 +log_must eval "python3 -c 'print \"a\" * 4096' | \
- 	attr -s bigval /$TESTPOOL/$TESTFS2/attrs"
+ 	set_xattr_stdin bigval /$TESTPOOL/$TESTFS2/attrs"
  log_must zfs set compression=off xattr=on $TESTPOOL/$TESTFS2
  
 diff --git a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
-index 12a72fa09..aceec7880 100755
+index 394fe95bb..43560aac5 100755
 --- a/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 +++ b/tests/zfs-tests/tests/functional/rsend/send_realloc_dnode_size.ksh
 @@ -93,7 +93,7 @@ log_must zfs snapshot $POOL/fs@c
  # 4. Create an empty file and add xattrs to it to exercise reclaiming a
  #    dnode that requires more than 1 slot for its bonus buffer (Zol #7433)
  log_must zfs set compression=on xattr=sa $POOL/fs
--log_must eval "python -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs"
-+log_must eval "python3 -c 'print \"a\" * 512' | attr -s bigval /$POOL/fs/attrs"
+-log_must eval "python -c 'print \"a\" * 512' |
++log_must eval "python3 -c 'print \"a\" * 512' |
+     set_xattr_stdin bigval /$POOL/fs/attrs"
  log_must zfs snapshot $POOL/fs@d
  
- # 5. Generate initial and incremental streams
diff --git a/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch b/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch
index c5d27816..98aaf020 100644
--- a/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch
+++ b/debian/patches/0008-Add-systemd-unit-for-importing-specific-pools.patch
@@ -13,9 +13,9 @@ can contain characters which will be escaped by systemd.
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 ---
  etc/systemd/system/50-zfs.preset.in       |  1 +
- etc/systemd/system/Makefile.am            |  2 ++
- etc/systemd/system/zfs-import@.service.in | 17 +++++++++++++++++
- 3 files changed, 20 insertions(+)
+ etc/systemd/system/Makefile.am            |  1 +
+ etc/systemd/system/zfs-import@.service.in | 16 ++++++++++++++++
+ 3 files changed, 18 insertions(+)
  create mode 100644 etc/systemd/system/zfs-import@.service.in
 
 diff --git a/etc/systemd/system/50-zfs.preset.in b/etc/systemd/system/50-zfs.preset.in
@@ -31,10 +31,10 @@ index e4056a92c..030611419 100644
  enable zfs-mount.service
  enable zfs-share.service
 diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
-index 4e14467a0..ae72102af 100644
+index c374a52ac..25d1b99d7 100644
 --- a/etc/systemd/system/Makefile.am
 +++ b/etc/systemd/system/Makefile.am
-@@ -5,6 +5,7 @@ systemdunit_DATA = \
+@@ -7,6 +7,7 @@ systemdunit_DATA = \
  	zfs-zed.service \
  	zfs-import-cache.service \
  	zfs-import-scan.service \
@@ -42,17 +42,9 @@ index 4e14467a0..ae72102af 100644
  	zfs-mount.service \
  	zfs-share.service \
  	zfs-volume-wait.service \
-@@ -16,6 +17,7 @@ EXTRA_DIST = \
- 	$(top_srcdir)/etc/systemd/system/zfs-zed.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-import-cache.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-import-scan.service.in \
-+	$(top_srcdir)/etc/systemd/system/zfs-import@.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-mount.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-share.service.in \
- 	$(top_srcdir)/etc/systemd/system/zfs-import.target.in \
 diff --git a/etc/systemd/system/zfs-import@.service.in b/etc/systemd/system/zfs-import@.service.in
 new file mode 100644
-index 000000000..2db9fdaab
+index 000000000..9b4ee9371
 --- /dev/null
 +++ b/etc/systemd/system/zfs-import@.service.in
 @@ -0,0 +1,16 @@
diff --git a/upstream b/upstream
index d2632f0c..dcbf8474 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit d2632f0cc196a685428115ab023bf4fe3d8e5806
+Subproject commit dcbf8474933cb22b90dbd7f514c8a4c71ea4c1cf
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 2/9] Install files under multiarch directories

[Stoiko Ivanov]

adapted from debian-upstream 8f137b115a89348e7816f60b5e8410fd303fec81

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/libnvpair1linux.install    |  1 -
 debian/libnvpair1linux.install.in |  1 +
 debian/libuutil1linux.install     |  1 -
 debian/libuutil1linux.install.in  |  1 +
 debian/libzfs2linux.install       |  2 --
 debian/libzfs2linux.install.in    |  2 ++
 debian/libzfslinux-dev.install    |  4 ----
 debian/libzfslinux-dev.install.in |  4 ++++
 debian/libzpool2linux.install     |  1 -
 debian/libzpool2linux.install.in  |  1 +
 debian/rules                      | 14 ++++++++++----
 11 files changed, 19 insertions(+), 13 deletions(-)
 delete mode 100644 debian/libnvpair1linux.install
 create mode 100644 debian/libnvpair1linux.install.in
 delete mode 100644 debian/libuutil1linux.install
 create mode 100644 debian/libuutil1linux.install.in
 delete mode 100644 debian/libzfs2linux.install
 create mode 100644 debian/libzfs2linux.install.in
 delete mode 100644 debian/libzfslinux-dev.install
 create mode 100644 debian/libzfslinux-dev.install.in
 delete mode 100644 debian/libzpool2linux.install
 create mode 100644 debian/libzpool2linux.install.in

diff --git a/debian/libnvpair1linux.install b/debian/libnvpair1linux.install
deleted file mode 100644
index 34a0f618..00000000
--- a/debian/libnvpair1linux.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libnvpair.so.*
diff --git a/debian/libnvpair1linux.install.in b/debian/libnvpair1linux.install.in
new file mode 100644
index 00000000..ed7b541e
--- /dev/null
+++ b/debian/libnvpair1linux.install.in
@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libnvpair.so.*
diff --git a/debian/libuutil1linux.install b/debian/libuutil1linux.install
deleted file mode 100644
index c7fa63e7..00000000
--- a/debian/libuutil1linux.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libuutil.so.*
diff --git a/debian/libuutil1linux.install.in b/debian/libuutil1linux.install.in
new file mode 100644
index 00000000..a197d030
--- /dev/null
+++ b/debian/libuutil1linux.install.in
@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libuutil.so.*
diff --git a/debian/libzfs2linux.install b/debian/libzfs2linux.install
deleted file mode 100644
index 660dede8..00000000
--- a/debian/libzfs2linux.install
+++ /dev/null
@@ -1,2 +0,0 @@
-lib/libzfs.so.*
-lib/libzfs_core.so.*
diff --git a/debian/libzfs2linux.install.in b/debian/libzfs2linux.install.in
new file mode 100644
index 00000000..6765aaee
--- /dev/null
+++ b/debian/libzfs2linux.install.in
@@ -0,0 +1,2 @@
+lib/@DEB_HOST_MULTIARCH@/libzfs.so.*
+lib/@DEB_HOST_MULTIARCH@/libzfs_core.so.*
diff --git a/debian/libzfslinux-dev.install b/debian/libzfslinux-dev.install
deleted file mode 100644
index 1a74689a..00000000
--- a/debian/libzfslinux-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/*.a usr/lib/
-usr/include
-usr/lib/*.so
-lib/pkgconfig/*.pc usr/lib/pkgconfig/
diff --git a/debian/libzfslinux-dev.install.in b/debian/libzfslinux-dev.install.in
new file mode 100644
index 00000000..e515ddb8
--- /dev/null
+++ b/debian/libzfslinux-dev.install.in
@@ -0,0 +1,4 @@
+lib/@DEB_HOST_MULTIARCH@/*.a usr/lib/@DEB_HOST_MULTIARCH@/
+usr/include
+usr/lib/@DEB_HOST_MULTIARCH@/*.so
+/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/*.pc
diff --git a/debian/libzpool2linux.install b/debian/libzpool2linux.install
deleted file mode 100644
index d886d295..00000000
--- a/debian/libzpool2linux.install
+++ /dev/null
@@ -1 +0,0 @@
-lib/libzpool.so.*
diff --git a/debian/libzpool2linux.install.in b/debian/libzpool2linux.install.in
new file mode 100644
index 00000000..b9e872df
--- /dev/null
+++ b/debian/libzpool2linux.install.in
@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzpool.so.*
diff --git a/debian/rules b/debian/rules
index 623cc610..0e168ee1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,8 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 	  --bindir=/usr/bin \
 	  --sbindir=/sbin \
-	  --libdir=/lib \
+	  --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 \
@@ -39,6 +40,11 @@ override_dh_auto_configure:
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \
 	  --with-config=user
 
+	for i in $(wildcard $(CURDIR)/debian/*.install.in) ; do \
+		basename "$$i" | grep _KVERS_ && continue ; \
+		sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' "$$i" > "$${i%%.in}" ; \
+	done
+
 override_dh_auto_test:
 	# The dh_auto_test rule is disabled because
 	# `make check` cannot run in an unprivileged build environment.
@@ -62,9 +68,9 @@ override_dh_auto_install:
 	@# Zed has dependencies outside of the system root.
 	mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 
-	mkdir -p $(CURDIR)/debian/tmp/usr/lib
-	for i in `ls $(CURDIR)/debian/tmp/lib/*.so`; do \
-		ln -s /lib/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/`basename $${i}`; \
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	for i in `ls $(CURDIR)/debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*.so`; do \
+		ln -s /lib/$(DEB_HOST_MULTIARCH)/`readlink $${i}` $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/`basename $${i}`; \
 		rm $${i}; \
 	done
 
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 3/9] Bump libz{fs, pool, uutil} soname version

[Stoiko Ivanov]

adapted from debian-upstream 490ecc37abc7f6759293b90334768d088f2ff98c

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 Makefile                                      |  8 ++--
 debian/control                                | 48 +++++++++----------
 debian/libnvpair1linux.lintian-overrides      |  1 -
 ...nvpair1linux.docs => libnvpair2linux.docs} |  0
 ....install.in => libnvpair2linux.install.in} |  0
 debian/libnvpair2linux.lintian-overrides      |  1 +
 debian/libuutil1linux.lintian-overrides       |  1 -
 ...ibuutil1linux.docs => libuutil2linux.docs} |  0
 ...x.install.in => libuutil2linux.install.in} |  0
 debian/libuutil2linux.lintian-overrides       |  1 +
 debian/libzfs2linux.lintian-overrides         |  1 -
 .../{libzfs2linux.docs => libzfs3linux.docs}  |  0
 ...nux.install.in => libzfs3linux.install.in} |  0
 debian/libzfs3linux.lintian-overrides         |  1 +
 debian/libzpool2linux.lintian-overrides       |  1 -
 ...ibzpool2linux.docs => libzpool3linux.docs} |  0
 ...x.install.in => libzpool3linux.install.in} |  0
 debian/libzpool3linux.lintian-overrides       |  1 +
 18 files changed, 32 insertions(+), 32 deletions(-)
 delete mode 100644 debian/libnvpair1linux.lintian-overrides
 rename debian/{libnvpair1linux.docs => libnvpair2linux.docs} (100%)
 rename debian/{libnvpair1linux.install.in => libnvpair2linux.install.in} (100%)
 create mode 100644 debian/libnvpair2linux.lintian-overrides
 delete mode 100644 debian/libuutil1linux.lintian-overrides
 rename debian/{libuutil1linux.docs => libuutil2linux.docs} (100%)
 rename debian/{libuutil1linux.install.in => libuutil2linux.install.in} (100%)
 create mode 100644 debian/libuutil2linux.lintian-overrides
 delete mode 100644 debian/libzfs2linux.lintian-overrides
 rename debian/{libzfs2linux.docs => libzfs3linux.docs} (100%)
 rename debian/{libzfs2linux.install.in => libzfs3linux.install.in} (100%)
 create mode 100644 debian/libzfs3linux.lintian-overrides
 delete mode 100644 debian/libzpool2linux.lintian-overrides
 rename debian/{libzpool2linux.docs => libzpool3linux.docs} (100%)
 rename debian/{libzpool2linux.install.in => libzpool3linux.install.in} (100%)
 create mode 100644 debian/libzpool3linux.lintian-overrides

diff --git a/Makefile b/Makefile
index 0da7c7ae..e0dad3a6 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
 ZFSDIR=zfs-linux_${ZFSVER}
 ZFSSRC=upstream
 
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB1= libnvpair2linux_${ZFSPKGVER}_amd64.deb
 ZFS_DEB2= 					\
-libuutil1linux_${ZFSPKGVER}_amd64.deb		\
-libzfs2linux_${ZFSPKGVER}_amd64.deb		\
+libuutil2linux_${ZFSPKGVER}_amd64.deb		\
+libzfs3linux_${ZFSPKGVER}_amd64.deb		\
 libzfslinux-dev_${ZFSPKGVER}_amd64.deb		\
-libzpool2linux_${ZFSPKGVER}_amd64.deb		\
+libzpool3linux_${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 422b2c52..72217981 100644
--- a/debian/control
+++ b/debian/control
@@ -19,23 +19,23 @@ 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: libnvpair1linux
+Package: libnvpair2linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libnvpair1
-Replaces: libnvpair1
+Breaks: libnvpair1, libnvpair1linux
+Replaces: libnvpair1, libnvpair1linux
 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
  kernel and userland, and possibly saving onto disk files.
 
-Package: libuutil1linux
+Package: libuutil2linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libuutil1
-Replaces: libuutil1
+Breaks: libuutil1, libuutil1linux
+Replaces: libuutil1, libuutil1linux
 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
@@ -50,25 +50,25 @@ Description: Solaris userland utility library for Linux
 Package: libzfslinux-dev
 Section: contrib/libdevel
 Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
+Depends: libnvpair2linux (= ${binary:Version}),
+         libuutil2linux (= ${binary:Version}),
+         libzfs3linux (= ${binary:Version}),
+         libzpool3linux (= ${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 libnvpair1, libuutil1,
- libzpool2 and libzfs2.
+ This package includes the development files of libnvpair2, libuutil2,
+ libzpool3 and libzfs3.
 
-Package: libzfs2linux
+Package: libzfs3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2
-Replaces: libzfs2
+Breaks: libzfs2, libzfs2linux
+Replaces: libzfs2, libzfs2linux
 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,
@@ -76,12 +76,12 @@ Description: OpenZFS filesystem library for Linux
  .
  The OpenZFS library provides support for managing OpenZFS filesystems.
 
-Package: libzpool2linux
+Package: libzpool3linux
 Section: contrib/libs
 Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2
-Replaces: libzpool2
+Breaks: libzpool2, libzpool2linux
+Replaces: libzpool2, libzpool2linux
 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,
@@ -216,10 +216,10 @@ Package: zfs-dbg
 Section: contrib/debug
 Priority: optional
 Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
-         libuutil1linux (= ${binary:Version}),
-         libzfs2linux (= ${binary:Version}),
-         libzpool2linux (= ${binary:Version}),
+Depends: libnvpair2linux (= ${binary:Version}),
+         libuutil2linux (= ${binary:Version}),
+         libzfs3linux (= ${binary:Version}),
+         libzpool3linux (= ${binary:Version}),
          zfs-zed (= ${binary:Version}),
          zfsutils-linux (= ${binary:Version}),
          ${misc:Depends}
@@ -228,8 +228,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 libzpool2linux, libzfs2linux,
- libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
+ This package contains the debugging symbols for libzpool3linux, libzfs3linux,
+ libnvpair2linux, libuutil2linux, zfs-zed and zfsutils-linux.
 
 Package: spl
 Section: contrib/metapackages
diff --git a/debian/libnvpair1linux.lintian-overrides b/debian/libnvpair1linux.lintian-overrides
deleted file mode 100644
index cf912234..00000000
--- a/debian/libnvpair1linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnvpair1linux: package-name-doesnt-match-sonames
diff --git a/debian/libnvpair1linux.docs b/debian/libnvpair2linux.docs
similarity index 100%
rename from debian/libnvpair1linux.docs
rename to debian/libnvpair2linux.docs
diff --git a/debian/libnvpair1linux.install.in b/debian/libnvpair2linux.install.in
similarity index 100%
rename from debian/libnvpair1linux.install.in
rename to debian/libnvpair2linux.install.in
diff --git a/debian/libnvpair2linux.lintian-overrides b/debian/libnvpair2linux.lintian-overrides
new file mode 100644
index 00000000..ad4f1dfa
--- /dev/null
+++ b/debian/libnvpair2linux.lintian-overrides
@@ -0,0 +1 @@
+libnvpair2linux: package-name-doesnt-match-sonames
diff --git a/debian/libuutil1linux.lintian-overrides b/debian/libuutil1linux.lintian-overrides
deleted file mode 100644
index 058b0db3..00000000
--- a/debian/libuutil1linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libuutil1linux: package-name-doesnt-match-sonames
diff --git a/debian/libuutil1linux.docs b/debian/libuutil2linux.docs
similarity index 100%
rename from debian/libuutil1linux.docs
rename to debian/libuutil2linux.docs
diff --git a/debian/libuutil1linux.install.in b/debian/libuutil2linux.install.in
similarity index 100%
rename from debian/libuutil1linux.install.in
rename to debian/libuutil2linux.install.in
diff --git a/debian/libuutil2linux.lintian-overrides b/debian/libuutil2linux.lintian-overrides
new file mode 100644
index 00000000..30f7d718
--- /dev/null
+++ b/debian/libuutil2linux.lintian-overrides
@@ -0,0 +1 @@
+libuutil2linux: package-name-doesnt-match-sonames
diff --git a/debian/libzfs2linux.lintian-overrides b/debian/libzfs2linux.lintian-overrides
deleted file mode 100644
index a2a9d100..00000000
--- a/debian/libzfs2linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libzfs2linux: package-name-doesnt-match-sonames
diff --git a/debian/libzfs2linux.docs b/debian/libzfs3linux.docs
similarity index 100%
rename from debian/libzfs2linux.docs
rename to debian/libzfs3linux.docs
diff --git a/debian/libzfs2linux.install.in b/debian/libzfs3linux.install.in
similarity index 100%
rename from debian/libzfs2linux.install.in
rename to debian/libzfs3linux.install.in
diff --git a/debian/libzfs3linux.lintian-overrides b/debian/libzfs3linux.lintian-overrides
new file mode 100644
index 00000000..0630b2dd
--- /dev/null
+++ b/debian/libzfs3linux.lintian-overrides
@@ -0,0 +1 @@
+libzfs3linux: package-name-doesnt-match-sonames
diff --git a/debian/libzpool2linux.lintian-overrides b/debian/libzpool2linux.lintian-overrides
deleted file mode 100644
index 41a444f0..00000000
--- a/debian/libzpool2linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libzpool2linux: package-name-doesnt-match-sonames
diff --git a/debian/libzpool2linux.docs b/debian/libzpool3linux.docs
similarity index 100%
rename from debian/libzpool2linux.docs
rename to debian/libzpool3linux.docs
diff --git a/debian/libzpool2linux.install.in b/debian/libzpool3linux.install.in
similarity index 100%
rename from debian/libzpool2linux.install.in
rename to debian/libzpool3linux.install.in
diff --git a/debian/libzpool3linux.lintian-overrides b/debian/libzpool3linux.lintian-overrides
new file mode 100644
index 00000000..09f8fa21
--- /dev/null
+++ b/debian/libzpool3linux.lintian-overrides
@@ -0,0 +1 @@
+libzpool3linux: package-name-doesnt-match-sonames
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 4/9] ship arcstat(1) manual page

[Stoiko Ivanov]

From: Antonio Russo <aerusso@aerusso.net>

(cherry picked from commit c5b72db53215c2ca7b76c21113f466938517d71b)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/zfsutils-linux.install | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 229ff2ea..c3a32bcc 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -30,6 +30,7 @@ usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
 usr/share/bash-completion/completions
+usr/share/man/man1/arcstat.1
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
 usr/share/man/man5/
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 5/9] Manual pages were split into subpages

[Stoiko Ivanov]

adapted from debian-upstream a149a374057d55ec82d8d9d258105aeb316bb1fb

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/zfsutils-linux.install | 72 ++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index c3a32bcc..c376d537 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -38,9 +38,79 @@ usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
 usr/share/man/man8/vdev_id.8
 usr/share/man/man8/zdb.8
-usr/share/man/man8/zfs.8
+usr/share/man/man8/zfs-allow.8
+usr/share/man/man8/zfs-bookmark.8
+usr/share/man/man8/zfs-change-key.8
+usr/share/man/man8/zfs-clone.8
+usr/share/man/man8/zfs-create.8
+usr/share/man/man8/zfs-destroy.8
+usr/share/man/man8/zfs-diff.8
+usr/share/man/man8/zfs-get.8
+usr/share/man/man8/zfs-groupspace.8
+usr/share/man/man8/zfs-hold.8
+usr/share/man/man8/zfs-inherit.8
+usr/share/man/man8/zfs-jail.8
+usr/share/man/man8/zfs-list.8
+usr/share/man/man8/zfs-load-key.8
 usr/share/man/man8/zfs-mount-generator.8
+usr/share/man/man8/zfs-mount.8
 usr/share/man/man8/zfs-program.8
+usr/share/man/man8/zfs-project.8
+usr/share/man/man8/zfs-projectspace.8
+usr/share/man/man8/zfs-promote.8
+usr/share/man/man8/zfs-receive.8
+usr/share/man/man8/zfs-recv.8
+usr/share/man/man8/zfs-redact.8
+usr/share/man/man8/zfs-release.8
+usr/share/man/man8/zfs-rename.8
+usr/share/man/man8/zfs-rollback.8
+usr/share/man/man8/zfs-send.8
+usr/share/man/man8/zfs-set.8
+usr/share/man/man8/zfs-share.8
+usr/share/man/man8/zfs-snapshot.8
+usr/share/man/man8/zfs-unallow.8
+usr/share/man/man8/zfs-unjail.8
+usr/share/man/man8/zfs-unload-key.8
+usr/share/man/man8/zfs-unmount.8
+usr/share/man/man8/zfs-upgrade.8
+usr/share/man/man8/zfs-userspace.8
+usr/share/man/man8/zfs-wait.8
+usr/share/man/man8/zfs.8
+usr/share/man/man8/zfsconcepts.8
+usr/share/man/man8/zfsprops.8
 usr/share/man/man8/zgenhostid.8
+usr/share/man/man8/zpool-add.8
+usr/share/man/man8/zpool-attach.8
+usr/share/man/man8/zpool-checkpoint.8
+usr/share/man/man8/zpool-clear.8
+usr/share/man/man8/zpool-create.8
+usr/share/man/man8/zpool-destroy.8
+usr/share/man/man8/zpool-detach.8
+usr/share/man/man8/zpool-events.8
+usr/share/man/man8/zpool-export.8
+usr/share/man/man8/zpool-get.8
+usr/share/man/man8/zpool-history.8
+usr/share/man/man8/zpool-import.8
+usr/share/man/man8/zpool-initialize.8
+usr/share/man/man8/zpool-iostat.8
+usr/share/man/man8/zpool-labelclear.8
+usr/share/man/man8/zpool-list.8
+usr/share/man/man8/zpool-offline.8
+usr/share/man/man8/zpool-online.8
+usr/share/man/man8/zpool-reguid.8
+usr/share/man/man8/zpool-remove.8
+usr/share/man/man8/zpool-reopen.8
+usr/share/man/man8/zpool-replace.8
+usr/share/man/man8/zpool-resilver.8
+usr/share/man/man8/zpool-scrub.8
+usr/share/man/man8/zpool-set.8
+usr/share/man/man8/zpool-split.8
+usr/share/man/man8/zpool-status.8
+usr/share/man/man8/zpool-sync.8
+usr/share/man/man8/zpool-trim.8
+usr/share/man/man8/zpool-upgrade.8
+usr/share/man/man8/zpool-wait.8
 usr/share/man/man8/zpool.8
+usr/share/man/man8/zpoolconcepts.8
+usr/share/man/man8/zpoolprops.8
 usr/share/man/man8/zstreamdump.8
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 6/9] Add new zstream utility

[Stoiko Ivanov]

From: Antonio Russo <aerusso@aerusso.net>

(cherry picked from commit 7f3dec474aff811b72220858fb5935054fd58a3c)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/zfsutils-linux.install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index c376d537..6a18eab9 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -21,6 +21,7 @@ sbin/zdb
 sbin/zfs
 sbin/zhack
 sbin/zpool
+sbin/zstream
 sbin/zstreamdump
 usr/bin/zgenhostid
 usr/bin/zvol_wait
@@ -113,4 +114,5 @@ usr/share/man/man8/zpool-wait.8
 usr/share/man/man8/zpool.8
 usr/share/man/man8/zpoolconcepts.8
 usr/share/man/man8/zpoolprops.8
+usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 7/9] Include new zfs_ids_to_path tool

[Stoiko Ivanov]

From: Antonio Russo <aerusso@aerusso.net>

(cherry picked from commit 3376e22c139b6dcd5774018fc7ebcdff9fac66c3)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/zfsutils-linux.install | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 6a18eab9..77b3ab88 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -19,6 +19,7 @@ sbin/fsck.zfs
 sbin/mount.zfs
 sbin/zdb
 sbin/zfs
+sbin/zfs_ids_to_path
 sbin/zhack
 sbin/zpool
 sbin/zstream
@@ -77,6 +78,7 @@ usr/share/man/man8/zfs-upgrade.8
 usr/share/man/man8/zfs-userspace.8
 usr/share/man/man8/zfs-wait.8
 usr/share/man/man8/zfs.8
+usr/share/man/man8/zfs_ids_to_path.8
 usr/share/man/man8/zfsconcepts.8
 usr/share/man/man8/zfsprops.8
 usr/share/man/man8/zgenhostid.8
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 8/9] Include new pam_zfs_key mechanism

[Stoiko Ivanov]

From: Antonio Russo <aerusso@aerusso.net>

(cherry picked from commit 340f9394c38a78b2530a64746c1518163d7f6970)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/rules                  | 2 ++
 debian/zfsutils-linux.install | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/debian/rules b/debian/rules
index 0e168ee1..1ce79add 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,7 @@ override_dh_auto_configure:
 	  --enable-systemd \
 	  --enable-pyzfs \
 	  --with-python=python3 \
+	  --with-pammoduledir='/lib/$(DEB_HOST_MULTIARCH)/security' \
 	  --with-systemdunitdir=/lib/systemd/system \
 	  --with-systemdpresetdir=/lib/systemd/system-preset \
 	  --with-systemdgeneratordir=/lib/systemd/system-generators \
@@ -102,6 +103,7 @@ override_dh_auto_clean:
 
 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:
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 77b3ab88..04f0fe48 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -2,6 +2,7 @@
 etc/default/zfs
 etc/zfs/zfs-functions
 etc/zfs/zpool.d/
+lib/*/security/pam_zfs_key.so
 lib/systemd/system-preset/
 lib/systemd/system/zfs-import-cache.service
 lib/systemd/system/zfs-import-scan.service
@@ -118,3 +119,4 @@ usr/share/man/man8/zpoolconcepts.8
 usr/share/man/man8/zpoolprops.8
 usr/share/man/man8/zstream.8
 usr/share/man/man8/zstreamdump.8
+usr/share/pam-configs/zfs_key
-- 
2.20.1

[pve-devel] [PATCH zfsonlinux 9/9] package zfsbootenv library

[Stoiko Ivanov]

adapted from debian-upstream 0be5e4edc2eef9885fd03e9c797b9429da539ce2

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/control                               | 12 ++++++++++++
 debian/libzfsbootenv1linux.docs              |  2 ++
 debian/libzfsbootenv1linux.install           |  1 +
 debian/libzfsbootenv1linux.install.in        |  1 +
 debian/libzfsbootenv1linux.lintian-overrides |  2 ++
 5 files changed, 18 insertions(+)
 create mode 100644 debian/libzfsbootenv1linux.docs
 create mode 100644 debian/libzfsbootenv1linux.install
 create mode 100644 debian/libzfsbootenv1linux.install.in
 create mode 100644 debian/libzfsbootenv1linux.lintian-overrides

diff --git a/debian/control b/debian/control
index 72217981..cda525a8 100644
--- a/debian/control
+++ b/debian/control
@@ -53,6 +53,7 @@ Architecture: linux-any
 Depends: libnvpair2linux (= ${binary:Version}),
          libuutil2linux (= ${binary:Version}),
          libzfs3linux (= ${binary:Version}),
+         libzfsbootenv1linux (= ${binary:Version}),
          libzpool3linux (= ${binary:Version}),
          ${misc:Depends}
 Provides: libnvpair-dev, libuutil-dev
@@ -76,6 +77,17 @@ Description: OpenZFS filesystem library for Linux
  .
  The OpenZFS library provides support for managing OpenZFS filesystems.
 
+Package: libzfsbootenv1linux
+Section: contrib/libs
+Architecture: linux-any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+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,
+ compression, encryption, snapshots, and more.
+ .
+ The zfsbootenv library provides support for modifying ZFS label information.
+
 Package: libzpool3linux
 Section: contrib/libs
 Architecture: linux-any
diff --git a/debian/libzfsbootenv1linux.docs b/debian/libzfsbootenv1linux.docs
new file mode 100644
index 00000000..4302f1b2
--- /dev/null
+++ b/debian/libzfsbootenv1linux.docs
@@ -0,0 +1,2 @@
+COPYRIGHT
+LICENSE
diff --git a/debian/libzfsbootenv1linux.install b/debian/libzfsbootenv1linux.install
new file mode 100644
index 00000000..01d3f0c3
--- /dev/null
+++ b/debian/libzfsbootenv1linux.install
@@ -0,0 +1 @@
+lib/libzfsbootenv.so.*
diff --git a/debian/libzfsbootenv1linux.install.in b/debian/libzfsbootenv1linux.install.in
new file mode 100644
index 00000000..49216742
--- /dev/null
+++ b/debian/libzfsbootenv1linux.install.in
@@ -0,0 +1 @@
+lib/@DEB_HOST_MULTIARCH@/libzfsbootenv.so.*
diff --git a/debian/libzfsbootenv1linux.lintian-overrides b/debian/libzfsbootenv1linux.lintian-overrides
new file mode 100644
index 00000000..7e1a3fc5
--- /dev/null
+++ b/debian/libzfsbootenv1linux.lintian-overrides
@@ -0,0 +1,2 @@
+libzfsbootenv1linux: package-name-doesnt-match-sonames
+libzfsbootenv1linux: extra-license-file usr/share/doc/libzfsbootenv1linux/LICENSE.gz
-- 
2.20.1

[pve-devel] applied-series: [PATCH zfsonlinux/pve-kernel] ZFS 2.0.0 preview

[Thomas Lamprecht]

On 02.12.20 20:17, Stoiko Ivanov wrote:
> The following patchset is meant as a first rc of our packaging for ZFS 2.0
> 
> for the greatest part I mirrored the merge request by Antonio Russo over
> at salsa.d.o [0], and adapted where needed.
> 
> Another change, which was merged at debian, before the merge request, was
> the placement of shared library files in arch-specific directories
> (/lib/x86_64-linux-gnu/) - I added that here too.
> 
> Only minimally tested (upgrading an up to date PVE-6.3 (installed on top
> of plain buster), and running `ztest -v 1 -s 32M -f /media/`)
> 
> [0] https://salsa.debian.org/zfsonlinux-team/zfs/-/merge_requests/24
> 
> zfsonlinux:
> Antonio Russo (4):
>   ship arcstat(1) manual page
>   Add new zstream utility
>   Include new zfs_ids_to_path tool
>   Include new pam_zfs_key mechanism
> 
> Stoiko Ivanov (5):
>   update submodule and patches for zfs-2.0.0
>   Install files under multiarch directories
>   Bump libz{fs,pool,uutil} soname version
>   Manual pages were split into subpages
>   package zfsbootenv library
> 

applied series, thanks!

Updated the submodule to the more recently released 2.0.1 in a followup, seems
to not require any additional packaging changes and worked fine here in my test
setup.

I plan to actually upload userspace packages with next actual kernel bump, probably
next week.