[pve-devel] [PATCH zfsonlinux 00/15] update to ZFS 0.8.0

Stoiko Ivanov s.ivanov at proxmox.com
Thu May 23 23:11:27 CEST 2019


ZFS on Linux has just released 0.8.0 [0] bringing many new features and
improvments (see upstreams release notes).

>From a packaging perspective the biggest change is the merge of the
source repositories of spl and zfs (into the zfs repository), hence this
large number of patches mostly consisting of moving files around.

Actual changes to the packaging infrastructure:
* For the greatest part I tried to stay in line with debian's experimental
  branch, which has zfs-0.8-rc4 as base [1].
* Additionally a postinst script for zfsutils-linux was added, which
  generates /etc/hostid if it does not exist yet. This used to be done in
  the postinst script of the spl userspace package, which has become an
  transitional meta-package, since it ships not files anymore (splat got
  removed in zfs-0.8)
* Apart from removing the spl subdirectory, the patchset removes the
  intermediate zfs directory as well.
* one patch factors out the sed of the META file into a target of its own
  and calls it while preparing the kernel-sources (without it it wasn't possible
  to build a rc-release (0.8.0~rc5-
* 3 patches were added (and submitted upstream) addressing cosmetic lintian
  problems.

Would be grateful for feedback and and views (probably especially on the hostid
thing)


[0] https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.8.0
[1] https://salsa.debian.org/zfsonlinux-team/zfs/tree/experimental

Stoiko Ivanov (15):
  update ZFS to 0.8.0
  debian: replace zpool.d patch by configure option
  rebase patches on top of zfs-0.8.0
  zfs/debian: embed downstream revision in META file
  debian: adapt install paths to ZFS 0.8
  debian/rules: adapt to ZFS 0.8
  zfsutils-linux: persist hostid in postinst script
  zfs/control: add spl as transitional dummy package
  add python3-pyzfs binary package
  debian/docs: change OPENSOLARIS.LICENSE to LICENSE
  spl: remove submodule and debian folder
  debian/control: set zfs-dbg priority to extra
  add 3 patches for lintian errors
  Move zfs to top-level directory
  add changelog for 0.8.0

 .gitmodules                                        |   5 +-
 Makefile                                           |  41 +--
 {zfs/debian => debian}/changelog                   |  11 +
 {spl/debian => debian}/compat                      |   0
 {zfs/debian => debian}/control                     |  77 ++++-
 {zfs/debian => debian}/copyright                   |   0
 {zfs/debian => debian}/copyright.cme               |   2 +-
 debian/libnvpair1linux.docs                        |   2 +
 {zfs/debian => debian}/libnvpair1linux.install     |   0
 .../libnvpair1linux.lintian-overrides              |   0
 debian/libuutil1linux.docs                         |   2 +
 {zfs/debian => debian}/libuutil1linux.install      |   0
 .../libuutil1linux.lintian-overrides               |   0
 debian/libzfs2linux.docs                           |   2 +
 {zfs/debian => debian}/libzfs2linux.install        |   0
 .../libzfs2linux.lintian-overrides                 |   0
 debian/libzfslinux-dev.docs                        |   2 +
 {zfs/debian => debian}/libzfslinux-dev.install     |   0
 debian/libzpool2linux.docs                         |   2 +
 {zfs/debian => debian}/libzpool2linux.install      |   0
 .../libzpool2linux.lintian-overrides               |   0
 {zfs/debian => debian}/not-installed               |   0
 ...-for-META-and-DCH-consistency-in-autoconf.patch |   4 +-
 .../0002-always-load-ZFS-module-on-boot.patch      |   0
 ...ath-to-the-zed-binary-on-the-systemd-unit.patch |   6 +-
 ...-increase-default-zcmd-allocation-to-256K.patch |   4 +-
 ...ort-with-d-dev-disk-by-id-in-scan-service.patch |   4 +-
 .../patches/0006-Enable-zed-emails.patch           |   2 +-
 ...x-ksh-path-for-random_readwrite_fixed.ksh.patch |  24 ++
 ...-test-runner.py-change-shebang-to-python3.patch |  28 ++
 ...osmetic-permission-issues-during-make-ins.patch | 110 ++++++
 debian/patches/series                              |   9 +
 debian/python3-pyzfs.install                       |   1 +
 {zfs/debian => debian}/rules                       |  34 +-
 {spl/debian => debian}/source/format               |   0
 .../usr/share/initramfs-tools/conf.d/zfs           |   0
 .../usr/share/initramfs-tools/hooks/zdev           |   0
 .../tree/zfsutils-linux/etc/sudoers.d/zfs          |   0
 .../zfsutils-linux/usr/lib/os-probes/10zvol-test   |   0
 .../tree/zfsutils-linux/usr/lib/zfs-linux/scrub    |   0
 {zfs/debian => debian}/watch                       |   0
 {zfs/debian => debian}/zfs-initramfs.install       |   0
 {zfs/debian => debian}/zfs-initramfs.triggers      |   0
 {zfs/debian => debian}/zfs-test.install            |   6 -
 {zfs/debian => debian}/zfs-test.lintian-overrides  |   0
 {zfs/debian => debian}/zfs-zed.install             |   2 +-
 {zfs/debian => debian}/zfsutils-linux.cron.d       |   0
 debian/zfsutils-linux.docs                         |   2 +
 {zfs/debian => debian}/zfsutils-linux.examples     |   0
 {zfs/debian => debian}/zfsutils-linux.install      |   3 +
 .../zfsutils-linux.lintian-overrides               |   0
 debian/zfsutils-linux.postinst                     |  19 ++
 spl/debian/changelog                               | 380 ---------------------
 spl/debian/control                                 |  32 --
 spl/debian/copyright                               | 189 ----------
 spl/debian/rules                                   |  33 --
 spl/debian/source/options                          |   1 -
 spl/debian/spl.install                             |   2 -
 spl/debian/spl.lintian-overrides                   |   1 -
 spl/debian/spl.postinst                            |  49 ---
 spl/debian/spl.postrm                              |  10 -
 spl/debian/spl.preinst                             |  10 -
 spl/debian/watch                                   |   2 -
 spl/upstream                                       |   1 -
 upstream                                           |   1 +
 zfs/debian/compat                                  |   1 -
 zfs/debian/libnvpair1linux.docs                    |   2 -
 zfs/debian/libuutil1linux.docs                     |   2 -
 zfs/debian/libzfs2linux.docs                       |   2 -
 zfs/debian/libzfslinux-dev.docs                    |   2 -
 zfs/debian/libzpool2linux.docs                     |   2 -
 ...util-to-LIBADD-for-libzfs-and-libzfs_core.patch |  37 --
 ...3-add-man-page-reference-to-systemd-units.patch |  60 ----
 .../0005-fix-install-path-of-zpool.d-scripts.patch |  38 ---
 ...-for-arcstat.py-arc_summary.py-dbufstat.p.patch |  41 ---
 ...dlock-between-zfs-umount-snapentry_expire.patch |  61 ----
 zfs/debian/patches/series                          |  11 -
 zfs/debian/source/format                           |   1 -
 zfs/debian/zfsutils-linux.docs                     |   2 -
 zfs/upstream                                       |   1 -
 80 files changed, 338 insertions(+), 1040 deletions(-)
 rename {zfs/debian => debian}/changelog (98%)
 rename {spl/debian => debian}/compat (100%)
 rename {zfs/debian => debian}/control (67%)
 rename {zfs/debian => debian}/copyright (100%)
 rename {zfs/debian => debian}/copyright.cme (99%)
 create mode 100644 debian/libnvpair1linux.docs
 rename {zfs/debian => debian}/libnvpair1linux.install (100%)
 rename {zfs/debian => debian}/libnvpair1linux.lintian-overrides (100%)
 create mode 100644 debian/libuutil1linux.docs
 rename {zfs/debian => debian}/libuutil1linux.install (100%)
 rename {zfs/debian => debian}/libuutil1linux.lintian-overrides (100%)
 create mode 100644 debian/libzfs2linux.docs
 rename {zfs/debian => debian}/libzfs2linux.install (100%)
 rename {zfs/debian => debian}/libzfs2linux.lintian-overrides (100%)
 create mode 100644 debian/libzfslinux-dev.docs
 rename {zfs/debian => debian}/libzfslinux-dev.install (100%)
 create mode 100644 debian/libzpool2linux.docs
 rename {zfs/debian => debian}/libzpool2linux.install (100%)
 rename {zfs/debian => debian}/libzpool2linux.lintian-overrides (100%)
 rename {zfs/debian => debian}/not-installed (100%)
 rename {zfs/debian => debian}/patches/0001-Check-for-META-and-DCH-consistency-in-autoconf.patch (97%)
 rename zfs/debian/patches/0004-always-load-ZFS-module-on-boot.patch => debian/patches/0002-always-load-ZFS-module-on-boot.patch (100%)
 rename zfs/debian/patches/0007-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch => debian/patches/0003-Fix-the-path-to-the-zed-binary-on-the-systemd-unit.patch (87%)
 rename zfs/debian/patches/0008-increase-default-zcmd-allocation-to-256K.patch => debian/patches/0004-increase-default-zcmd-allocation-to-256K.patch (97%)
 rename zfs/debian/patches/0009-import-with-d-dev-disk-by-id-in-scan-service.patch => debian/patches/0005-import-with-d-dev-disk-by-id-in-scan-service.patch (91%)
 rename zfs/debian/patches/0011-Enable-zed-emails.patch => debian/patches/0006-Enable-zed-emails.patch (96%)
 create mode 100644 debian/patches/0007-Fix-ksh-path-for-random_readwrite_fixed.ksh.patch
 create mode 100644 debian/patches/0008-test-runner.py-change-shebang-to-python3.patch
 create mode 100644 debian/patches/0009-tests-fix-cosmetic-permission-issues-during-make-ins.patch
 create mode 100644 debian/patches/series
 create mode 100644 debian/python3-pyzfs.install
 rename {zfs/debian => debian}/rules (67%)
 rename {spl/debian => debian}/source/format (100%)
 rename {zfs/debian => debian}/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs (100%)
 rename {zfs/debian => debian}/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev (100%)
 rename {zfs/debian => debian}/tree/zfsutils-linux/etc/sudoers.d/zfs (100%)
 rename {zfs/debian => debian}/tree/zfsutils-linux/usr/lib/os-probes/10zvol-test (100%)
 rename {zfs/debian => debian}/tree/zfsutils-linux/usr/lib/zfs-linux/scrub (100%)
 rename {zfs/debian => debian}/watch (100%)
 rename {zfs/debian => debian}/zfs-initramfs.install (100%)
 rename {zfs/debian => debian}/zfs-initramfs.triggers (100%)
 rename {zfs/debian => debian}/zfs-test.install (72%)
 rename {zfs/debian => debian}/zfs-test.lintian-overrides (100%)
 rename {zfs/debian => debian}/zfs-zed.install (77%)
 rename {zfs/debian => debian}/zfsutils-linux.cron.d (100%)
 create mode 100644 debian/zfsutils-linux.docs
 rename {zfs/debian => debian}/zfsutils-linux.examples (100%)
 rename {zfs/debian => debian}/zfsutils-linux.install (87%)
 rename {zfs/debian => debian}/zfsutils-linux.lintian-overrides (100%)
 create mode 100644 debian/zfsutils-linux.postinst
 delete mode 100644 spl/debian/changelog
 delete mode 100644 spl/debian/control
 delete mode 100644 spl/debian/copyright
 delete mode 100755 spl/debian/rules
 delete mode 100644 spl/debian/source/options
 delete mode 100644 spl/debian/spl.install
 delete mode 100644 spl/debian/spl.lintian-overrides
 delete mode 100644 spl/debian/spl.postinst
 delete mode 100644 spl/debian/spl.postrm
 delete mode 100644 spl/debian/spl.preinst
 delete mode 100644 spl/debian/watch
 delete mode 160000 spl/upstream
 create mode 160000 upstream
 delete mode 100644 zfs/debian/compat
 delete mode 100644 zfs/debian/libnvpair1linux.docs
 delete mode 100644 zfs/debian/libuutil1linux.docs
 delete mode 100644 zfs/debian/libzfs2linux.docs
 delete mode 100644 zfs/debian/libzfslinux-dev.docs
 delete mode 100644 zfs/debian/libzpool2linux.docs
 delete mode 100644 zfs/debian/patches/0002-Add-libuutil-to-LIBADD-for-libzfs-and-libzfs_core.patch
 delete mode 100644 zfs/debian/patches/0003-add-man-page-reference-to-systemd-units.patch
 delete mode 100644 zfs/debian/patches/0005-fix-install-path-of-zpool.d-scripts.patch
 delete mode 100644 zfs/debian/patches/0006-Use-python3-for-arcstat.py-arc_summary.py-dbufstat.p.patch
 delete mode 100644 zfs/debian/patches/0010-Fix-deadlock-between-zfs-umount-snapentry_expire.patch
 delete mode 100644 zfs/debian/patches/series
 delete mode 100644 zfs/debian/source/format
 delete mode 100644 zfs/debian/zfsutils-linux.docs
 delete mode 160000 zfs/upstream

-- 
2.11.0





More information about the pve-devel mailing list