]> git.proxmox.com Git - zfsonlinux.git/log
zfsonlinux.git
3 years agocherry-pick file-mode fix from 2.0.3-staging
Stoiko Ivanov [Wed, 10 Feb 2021 14:55:15 +0000 (15:55 +0100)]
cherry-pick file-mode fix from 2.0.3-staging

the patch fixes a potential panic on systems running ZFS > 2.0.0 and
is already queued for inclusion in 2.0.3 - see [0] for a related
github issue.

[0] https://github.com/openzfs/zfs/issues/11474

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoupdate debian/copyright
Stoiko Ivanov [Tue, 9 Feb 2021 18:41:44 +0000 (19:41 +0100)]
update debian/copyright

by taking the current version from debian-upstream.

The only addition is an attribution for Proxmox for the files in
debian/*

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agobuildsys: make libpam-zfs a separate package
Stoiko Ivanov [Tue, 9 Feb 2021 18:41:43 +0000 (19:41 +0100)]
buildsys: make libpam-zfs a separate package

ZFS includes (since 2.0.0) a pam-module, which takes the login
credentials of an user to unlock their home-dataset.

Enabling it in its current state can cause some side-effects like
prompting for a password when running `su` as root (see [0]).

Our update to ZFS 2.0.0 shipped the pam config in zfsutils-linux,
whereas debian-upstream split it out into its own optional package

This commit adopts this change.
based on debian-upstream [1] commit
cad2f3d24aa44cfdce1e2eae8b6ba027efaba2d6

The issue becomes apparent by installing the current zfsutils-linux
package and running `pam-auth-update --package` (e.g. by installing
an upgraded libpam-runtime package).

[0] https://github.com/openzfs/zfs/issues/11222
[1] https://salsa.debian.org/zfsonlinux-team/zfs/

Reported-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Originally-by: Antonio Russo <aerusso@aerusso.net>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agobump version to 2.0.2-pve1
Thomas Lamprecht [Sat, 6 Feb 2021 09:23:07 +0000 (10:23 +0100)]
bump version to 2.0.2-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agomove manpage arcstat(1) to arcstat(8).
Stoiko Ivanov [Thu, 4 Feb 2021 19:09:17 +0000 (20:09 +0100)]
move manpage arcstat(1) to arcstat(8).

Adapted from debian upstream [0] commits:
1a3239e6b3b5604bb588c10912f57f32962b38c3
66b7241c965cdce730e76ca59c242fccc267b302

[0] https://salsa.debian.org/zfsonlinux-team/zfs/
Originally-By: Mo Zhou <cdluminate@gmail.com>
Originally-By: Antonio Russo <aerusso@aerusso.net>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agozgenhostid is installed in /sbin
Stoiko Ivanov [Thu, 4 Feb 2021 19:09:16 +0000 (20:09 +0100)]
zgenhostid is installed in /sbin

Adapted from debian upstream [0] commits:
76f1cec519ce3bd126dbb3b9d63e3a76c1b7c89e

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

Originally-By: Antonio Russo <aerusso@aerusso.net>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoupdate submodule to zfs-2.0.2
Stoiko Ivanov [Thu, 4 Feb 2021 19:09:15 +0000 (20:09 +0100)]
update submodule to zfs-2.0.2

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agod/rules: fix resolving sphinx-build on bullseye
Thomas Lamprecht [Fri, 15 Jan 2021 14:08:22 +0000 (15:08 +0100)]
d/rules: fix resolving sphinx-build on bullseye

It's included as link in /usr/bin there, so the grep matched it
twice, the actual file plus the link, resulting in a build failure.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agobump version to 2.0.1-pve1
Thomas Lamprecht [Wed, 13 Jan 2021 13:16:06 +0000 (14:16 +0100)]
bump version to 2.0.1-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoupdate submodule to zfs-2.0.1
Thomas Lamprecht [Wed, 13 Jan 2021 13:14:48 +0000 (14:14 +0100)]
update submodule to zfs-2.0.1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agopackage zfsbootenv library
Stoiko Ivanov [Wed, 2 Dec 2020 19:18:09 +0000 (20:18 +0100)]
package zfsbootenv library

adapted from debian-upstream 0be5e4edc2eef9885fd03e9c797b9429da539ce2

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoInclude new pam_zfs_key mechanism
Antonio Russo [Wed, 2 Dec 2020 19:18:08 +0000 (20:18 +0100)]
Include new pam_zfs_key mechanism

(cherry picked from commit 340f9394c38a78b2530a64746c1518163d7f6970)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoInclude new zfs_ids_to_path tool
Antonio Russo [Wed, 2 Dec 2020 19:18:07 +0000 (20:18 +0100)]
Include new zfs_ids_to_path tool

(cherry picked from commit 3376e22c139b6dcd5774018fc7ebcdff9fac66c3)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoAdd new zstream utility
Antonio Russo [Wed, 2 Dec 2020 19:18:06 +0000 (20:18 +0100)]
Add new zstream utility

(cherry picked from commit 7f3dec474aff811b72220858fb5935054fd58a3c)
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoManual pages were split into subpages
Stoiko Ivanov [Wed, 2 Dec 2020 19:18:05 +0000 (20:18 +0100)]
Manual pages were split into subpages

adapted from debian-upstream a149a374057d55ec82d8d9d258105aeb316bb1fb

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoship arcstat(1) manual page
Antonio Russo [Wed, 2 Dec 2020 19:18:04 +0000 (20:18 +0100)]
ship arcstat(1) manual page

(cherry picked from commit c5b72db53215c2ca7b76c21113f466938517d71b)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoBump libz{fs, pool, uutil} soname version
Stoiko Ivanov [Wed, 2 Dec 2020 19:18:03 +0000 (20:18 +0100)]
Bump libz{fs, pool, uutil} soname version

adapted from debian-upstream 490ecc37abc7f6759293b90334768d088f2ff98c

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoInstall files under multiarch directories
Stoiko Ivanov [Wed, 2 Dec 2020 19:18:02 +0000 (20:18 +0100)]
Install files under multiarch directories

adapted from debian-upstream 8f137b115a89348e7816f60b5e8410fd303fec81

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agoupdate submodule and patches for zfs-2.0.0
Stoiko Ivanov [Wed, 2 Dec 2020 19:18:01 +0000 (20:18 +0100)]
update submodule and patches for zfs-2.0.0

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
3 years agobump version to 0.8.5-pve1
Thomas Lamprecht [Thu, 8 Oct 2020 08:45:43 +0000 (10:45 +0200)]
bump version to 0.8.5-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoupdate submodule and patches for to zfs-0.8.5
Stoiko Ivanov [Wed, 7 Oct 2020 14:28:15 +0000 (16:28 +0200)]
update submodule and patches for to zfs-0.8.5

upstream commit 2d2ce04b9931927ffd045f9ebba3d39d4d31f7db changed the location
for installing pkgconfig files to the architecture specific one in /lib
instead of /usr/share - this patch reflects the change in
'debian/libzfslinux-dev.install'.

It follows the change from 9a04c500f17d8df20a017137211d0984cace98ff in
debian's repository [0].

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agobump version to 0.8.4-pve2
Thomas Lamprecht [Tue, 29 Sep 2020 03:31:42 +0000 (05:31 +0200)]
bump version to 0.8.4-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agozfs-import template: do not require systemd-udev-settle service
Thomas Lamprecht [Tue, 29 Sep 2020 03:55:38 +0000 (05:55 +0200)]
zfs-import template: do not require systemd-udev-settle service

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
3 years agoAdd systemd-unit for importing specific pools
Stoiko Ivanov [Wed, 16 Sep 2020 12:14:17 +0000 (14:14 +0200)]
Add systemd-unit for importing specific pools

This patch addresses the problems some users experience when some zpools are
created/imported with cachefile (which then causes other pools not to get
imported during boot) - when our tooling creates a pool we explictly
instantiate the service with the pool's name, ensuring that it will get
imported by scanning.

Suggested-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agobump version to 0.8.4-pve1
Thomas Lamprecht [Thu, 14 May 2020 08:39:14 +0000 (10:39 +0200)]
bump version to 0.8.4-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agoRemove the unnecessary --with systemd dh option.
Stoiko Ivanov [Wed, 13 May 2020 17:59:13 +0000 (19:59 +0200)]
Remove the unnecessary --with systemd dh option.

adapted from debian-upstream [0] commit
53276c973c5e69f75b43371a6c94adc5d9dcfec0
(the systemd sequence is enabled by default since debhelper v10 - see
debhelper(7))

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoBump Standards-Version to 4.5.0 (no change).
Stoiko Ivanov [Wed, 13 May 2020 17:59:12 +0000 (19:59 +0200)]
Bump Standards-Version to 4.5.0 (no change).

Compared the entries in the Debian Policy Manual's upgrade checklist [0]

inspired by debian-upstream [1] commit d756d10a40607bd2b9599aa959b2aa1738551e72

[0] https://www.debian.org/doc/debian-policy/upgrading-checklist.html
[1] https://salsa.debian.org/zfsonlinux-team/zfs.git

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoRefresh debian/not-installed
Antonio Russo [Wed, 13 May 2020 17:59:11 +0000 (19:59 +0200)]
Refresh debian/not-installed

/etc/default/zfs and /etc/zfs/zfs-functions are now installed by the
makefiles.  Continue to install them directly as before, but do not
--fail-missing because of them.

adapted from debian-upstream [0] commit
9a594875114fe186aebba2776b14817ab7f272ae

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoAdd dependencies for zfs-test
Antonio Russo [Wed, 13 May 2020 17:59:10 +0000 (19:59 +0200)]
Add dependencies for zfs-test

nfs-kernel-server is required for some tests

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoUse installed python3
Antonio Russo [Wed, 13 May 2020 17:59:09 +0000 (19:59 +0200)]
Use installed python3

adapted from debian-upstream [0] commit
594e747e14f3051513ea499c40c17cadb5d0e92b

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoupdate submodule and patches for zfs-0.8.4
Stoiko Ivanov [Wed, 13 May 2020 17:59:08 +0000 (19:59 +0200)]
update submodule and patches for zfs-0.8.4

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoadd ident to zedlet-list creation patch
Stoiko Ivanov [Thu, 26 Mar 2020 15:47:16 +0000 (16:47 +0100)]
add ident to zedlet-list creation patch

the last series of cherry-picks from salsa.d.o includes one patch for the
zfs-source, but the patch file does not contain ident-information.
This prevents it from being applied by import-patchqueue.

Fixed by adding ident based on the original patches commit message and
importing and exporting the patchqueue.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoPreserve /etc/zfs/zed.d configuration on upgrade
Antonio Russo [Fri, 20 Mar 2020 16:28:43 +0000 (17:28 +0100)]
Preserve /etc/zfs/zed.d configuration on upgrade

Of the zedlet scripts shipped by upstream, a subset are enabled by
default, by creating symlinks in /etc/zfs/zed.d.  These symlinks are
shipped in the zfs-zed package.  dpkg, however, does not support
conffile handling of symlinks, and therefore any changes (removals) to
the symlinks are not preserved on package upgrade.

To address this policy violation, we:

 1. During package build, create a list of enabled-by-default zedlets,
    instead of creating symlinks.
 2. On package removal, identify all enabled-by-default zedlets whose
    symlinks do not exist (i.e., were removed by the user). This is done
    by creating "whiteout" links to /dev/null in their place).
 3. On package installation, create links to enabled-by-default zedlets
    UNLESS there is already a file there (i.e., abort if there is a
    whiteout link).
 4. We also clean up broken symlinks to removed zedlets at package
    postinst.

(cherry picked and adapted from 5cee380324d74e640d5dd7a360faba3994c8007f [0])

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoRefresh upstream Git repo URL in d/copyright.
Mo Zhou [Fri, 20 Mar 2020 16:28:42 +0000 (17:28 +0100)]
Refresh upstream Git repo URL in d/copyright.

(cherry picked from 7916839f3f9f8735b6ee18ee4e25cf1670963272 [0])

[0] https://salsa.debian.org/zfsonlinux-team/zfs.git
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agocron: Do not error if already scrubbing
Richard Laager [Fri, 20 Mar 2020 16:28:41 +0000 (17:28 +0100)]
cron: Do not error if already scrubbing

If a pool is already scrubbing, zpool scrub will return an error.  This
breaks the cron scrub script.  It outputs that error and then does not
scrub any further pools.

This change checks to see if the pool is scrubbing before attempting to
start a scrub.  This addresses long-running scrubs.  Note that a
"long-running" scrub here is not necessarily a month long.  If the
system is shut off or the pool is exported, the scrub will resume later.

(cherry picked from 41e457da7bfc837a52f3389cb6961bc6737b874d [0])

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoReword ZFS Description
Stoiko Ivanov [Fri, 20 Mar 2020 16:28:40 +0000 (17:28 +0100)]
Reword ZFS Description

(cherry-picked and adapted from  ff8fbee152caa6b995839dae723dab484c3d295a [0])

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agobump version to 0.8.3-pve1
Thomas Lamprecht [Fri, 24 Jan 2020 08:11:55 +0000 (09:11 +0100)]
bump version to 0.8.3-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agoupdate submodule and patches for zfs-0.8.3
Thomas Lamprecht [Fri, 24 Jan 2020 08:11:47 +0000 (09:11 +0100)]
update submodule and patches for zfs-0.8.3

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agobump version to 0.8.2-pve2
Thomas Lamprecht [Wed, 23 Oct 2019 15:14:27 +0000 (17:14 +0200)]
bump version to 0.8.2-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agoFPU/SIMD: separate ZFS and Kernel approach for less interference
Thomas Lamprecht [Fri, 18 Oct 2019 18:03:00 +0000 (20:03 +0200)]
FPU/SIMD: separate ZFS and Kernel approach for less interference

github pull-request #9406[0].

[0]: https://github.com/zfsonlinux/zfs/pull/9406#event-2704412478

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agocherry-pick: Perform KABI checks in parallel
Thomas Lamprecht [Wed, 2 Oct 2019 12:58:44 +0000 (14:58 +0200)]
cherry-pick: Perform KABI checks in parallel

This reduces the required time for the configure step drastically,
from previous:
 # time ./configure --with-config=kernel
 -> 124.14s user 34.06s system 103% cpu 2:32.90 total
to now:
 # time ./configure --with-config=kernel
 -> 75.07s user 15.01s system 394% cpu 22.821 total

(152 seconds vs 22 seconds)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agobuildsys: ensure that all sources are copied over to the build directory
Thomas Lamprecht [Wed, 2 Oct 2019 13:42:40 +0000 (15:42 +0200)]
buildsys: ensure that all sources are copied over to the build directory

The copy command:
 # cp -a ${ZFSSRC}/* ${ZFSDIR}/
did not copied over hidden files (those beginning with a dot) and
thus a upstream patches which changed also .gitignore did not worked
when copied over 1:1, instead of removing the changes to .gitignore
it's IMO better to copy the full sources ensuring the whole state of
the upstream project source repo is used.

With submodules we still do not copy over a potential big .git
folder, as we as submodule user have the submodules .git state in our
.git/modules folder where the submodule just references to.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agofollowup: fpu struct initialized member was removed with 5.2
Thomas Lamprecht [Wed, 2 Oct 2019 05:20:53 +0000 (07:20 +0200)]
followup: fpu struct initialized member was removed with 5.2

That's why it was guarded with the "HAVE_KERNEL_FPU_INITIALIZED"
defined in the first place..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agobump version to 0.8.2-pve1
Thomas Lamprecht [Sat, 28 Sep 2019 06:35:08 +0000 (08:35 +0200)]
bump version to 0.8.2-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agod/zfsutils-linux: add new zfs-volume-wait related files to install list
Thomas Lamprecht [Sat, 28 Sep 2019 11:19:35 +0000 (13:19 +0200)]
d/zfsutils-linux: add new zfs-volume-wait related files to install list

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agoupdate submodule and patches to 0.8.2
Thomas Lamprecht [Sat, 28 Sep 2019 06:12:00 +0000 (08:12 +0200)]
update submodule and patches to 0.8.2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agod/rules: use dh_missing instead of dh_install --fail-missing
Thomas Lamprecht [Sat, 28 Sep 2019 11:14:19 +0000 (13:14 +0200)]
d/rules: use dh_missing instead of dh_install --fail-missing

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agobump version to 0.8.1-pve3
Thomas Lamprecht [Fri, 27 Sep 2019 12:41:27 +0000 (14:41 +0200)]
bump version to 0.8.1-pve3

only to mark the patched kernel module with a new version,
user space tools and packages where not changed.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years ago[SIMD]: FPU register save/restore is also required on 5.0 kernels~
Thomas Lamprecht [Fri, 27 Sep 2019 10:00:03 +0000 (12:00 +0200)]
[SIMD]: FPU register save/restore is also required on 5.0 kernels~

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Acked-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
4 years agobump version to 0.8.1-pve2
Thomas Lamprecht [Tue, 20 Aug 2019 15:10:24 +0000 (17:10 +0200)]
bump version to 0.8.1-pve2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agodrop no longer needed build-dependencies
Fabian Grünbichler [Thu, 8 Aug 2019 13:12:34 +0000 (15:12 +0200)]
drop no longer needed build-dependencies

see https://github.com/zfsonlinux/zfs/issues/9036

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
4 years agocherry-pick SIMD compat patches
Fabian Grünbichler [Thu, 8 Aug 2019 13:12:33 +0000 (15:12 +0200)]
cherry-pick SIMD compat patches

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
4 years agocherry-pick parallel mount fix
Fabian Grünbichler [Thu, 8 Aug 2019 13:12:32 +0000 (15:12 +0200)]
cherry-pick parallel mount fix

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
4 years agobump version to 0.8.1-pve1
Thomas Lamprecht [Fri, 14 Jun 2019 18:43:36 +0000 (20:43 +0200)]
bump version to 0.8.1-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agoupdate patches for zfs-0.8.1
Thomas Lamprecht [Fri, 14 Jun 2019 18:42:29 +0000 (20:42 +0200)]
update patches for zfs-0.8.1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agoupdate submodule to zfs-0.8.1
Thomas Lamprecht [Fri, 14 Jun 2019 18:36:48 +0000 (20:36 +0200)]
update submodule to zfs-0.8.1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agobump version to 0.8.0-pve1
Thomas Lamprecht [Fri, 24 May 2019 10:33:58 +0000 (12:33 +0200)]
bump version to 0.8.0-pve1

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agod/control: fix priority-extra-is-replaced-by-priority-optional
Thomas Lamprecht [Fri, 24 May 2019 10:53:19 +0000 (12:53 +0200)]
d/control: fix priority-extra-is-replaced-by-priority-optional

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agoensure submodule gets initialized on fresh clone and build
Thomas Lamprecht [Fri, 24 May 2019 10:52:54 +0000 (12:52 +0200)]
ensure submodule gets initialized on fresh clone and build

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agod/control: remove dependencies detected by useless-autoreconf-build-depends
Thomas Lamprecht [Fri, 24 May 2019 10:42:31 +0000 (12:42 +0200)]
d/control: remove dependencies detected by useless-autoreconf-build-depends

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agobuildsys: remove cruft and reoder var definition before use
Thomas Lamprecht [Fri, 24 May 2019 10:33:42 +0000 (12:33 +0200)]
buildsys: remove cruft and reoder var definition before use

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agoMove zfs to top-level directory
Stoiko Ivanov [Thu, 23 May 2019 21:11:41 +0000 (23:11 +0200)]
Move zfs to top-level directory

With the merge of spl and zfs the extra level of directories is not needed
anymore.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoadd 3 patches for lintian errors
Stoiko Ivanov [Thu, 23 May 2019 21:11:40 +0000 (23:11 +0200)]
add 3 patches for lintian errors

* wrong-path-for-interpreter is a lintian error, one single zfs-test used
/usr/bin/ksh instead of /bin/ksh.
* python-script-but-no-python-dep was reported because test-runner.py had
/usr/bin/python as shebang, but the buildsystem and our dependencies expected
/usr/bin/python3
* executable-not-elf-or-script were results of some files being installed with
the wrong permissions

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agodebian/control: set zfs-dbg priority to extra
Stoiko Ivanov [Thu, 23 May 2019 21:11:39 +0000 (23:11 +0200)]
debian/control: set zfs-dbg priority to extra

in order to appease lintian

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agospl: remove submodule and debian folder
Thomas Lamprecht [Fri, 24 May 2019 10:01:58 +0000 (12:01 +0200)]
spl: remove submodule and debian folder

Co-authored-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agodebian/docs: change OPENSOLARIS.LICENSE to LICENSE
Stoiko Ivanov [Thu, 23 May 2019 21:11:37 +0000 (23:11 +0200)]
debian/docs: change OPENSOLARIS.LICENSE to LICENSE

taken from debian upstream [0]

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoadd python3-pyzfs binary package
Stoiko Ivanov [Thu, 23 May 2019 21:11:36 +0000 (23:11 +0200)]
add python3-pyzfs binary package

taken from debian upstream [0]

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

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agozfs/control: add spl as transitional dummy package
Stoiko Ivanov [Thu, 23 May 2019 21:11:35 +0000 (23:11 +0200)]
zfs/control: add spl as transitional dummy package

since splat has been removed from zfs (during the repository merge of zfs and
spl, the userspace spl package does not contain any files (apart from metafiles)

keep the package as metapackage, s.t. the old splat manpage and binary gets
removed upon upgrade.

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agozfsutils-linux: persist hostid in postinst script
Stoiko Ivanov [Thu, 23 May 2019 21:11:34 +0000 (23:11 +0200)]
zfsutils-linux: persist hostid in postinst script

/etc/hostid does not exist on a minimal debian system.
ZFS reads its contents for MMP (zpool property multihost set to on), and needs
the value to be stable.
Before the SPL->ZFS merge the spl userspace package wrote the file (by parsing/
mangling the output of hostid (1)) Since ZFS provides the zgenhostid script,
which creates a random 4 byte hostid and writes it to /etc/hostid, we use that
instead. (hostid (1) default to mangling a configured ip of the system, which
can be the same across multiple installs (install happens with the same ip)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agodebian/rules: adapt to ZFS 0.8
Stoiko Ivanov [Thu, 23 May 2019 21:11:33 +0000 (23:11 +0200)]
debian/rules: adapt to ZFS 0.8

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agodebian: adapt install paths to ZFS 0.8
Stoiko Ivanov [Thu, 23 May 2019 21:11:32 +0000 (23:11 +0200)]
debian: adapt install paths to ZFS 0.8

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agozfs/debian: embed downstream revision in META file
Stoiko Ivanov [Thu, 23 May 2019 21:11:31 +0000 (23:11 +0200)]
zfs/debian: embed downstream revision in META file

taken from spl/debian/rules
Additionally refactor the actual change into a separate target.
This is needed when building the kernel-modules from an rc-tag (e.g. 0.8.0-rc5)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agorebase patches on top of zfs-0.8.0
Stoiko Ivanov [Thu, 23 May 2019 21:11:30 +0000 (23:11 +0200)]
rebase patches on top of zfs-0.8.0

rebase done with export-patchqueue and adapted to new 0.8 release

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agodebian: replace zpool.d patch by configure option
Stoiko Ivanov [Thu, 23 May 2019 21:11:29 +0000 (23:11 +0200)]
debian: replace zpool.d patch by configure option

the --with-zfsexecdir configure option is available in ZFS 0.8 and replaces
the patch for cmd/zpool/Makefile.am

(cherry-picked from salsa.d.o e1af594a0970e2b84c922f483e6798e7d155b7b7)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agoupdate ZFS to 0.8.0
Stoiko Ivanov [Thu, 23 May 2019 21:11:28 +0000 (23:11 +0200)]
update ZFS to 0.8.0

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
4 years agobuildsys: switch upload dist over to buster
Thomas Lamprecht [Thu, 23 May 2019 16:21:21 +0000 (18:21 +0200)]
buildsys: switch upload dist over to buster

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
4 years agobump version to 0.7.13-pve2~bpo2
Thomas Lamprecht [Tue, 21 May 2019 18:09:12 +0000 (20:09 +0200)]
bump version to 0.7.13-pve2~bpo2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
5 years agobump version to 0.7.13-pve1~bpo2
Thomas Lamprecht [Wed, 27 Mar 2019 09:29:30 +0000 (10:29 +0100)]
bump version to 0.7.13-pve1~bpo2

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
5 years agoremove conflict with insserv (<< 1.18)
Thomas Lamprecht [Wed, 27 Mar 2019 08:55:25 +0000 (09:55 +0100)]
remove conflict with insserv  (<< 1.18)

we do not use or ship initscripts anyway and support only systemd

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
5 years agofixup spl und zfs changelog entries
Thomas Lamprecht [Fri, 8 Mar 2019 05:53:42 +0000 (06:53 +0100)]
fixup spl und zfs changelog entries

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
5 years agobump version to 0.7.13-pve1~bpo1
Stoiko Ivanov [Thu, 7 Mar 2019 17:03:55 +0000 (18:03 +0100)]
bump version to 0.7.13-pve1~bpo1

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
5 years agoadd vdev_id.conf.scsi.example to examples
Stoiko Ivanov [Thu, 7 Mar 2019 17:03:54 +0000 (18:03 +0100)]
add vdev_id.conf.scsi.example to examples

(adapted from salsa.d.o 7ca194b9)

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
5 years agorebase patches on top of zfs-0.7.13
Stoiko Ivanov [Thu, 7 Mar 2019 17:03:53 +0000 (18:03 +0100)]
rebase patches on top of zfs-0.7.13

rebase done with import-patchqueue/export-patchqueue

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
5 years agoupdate ZFS to 0.7.13
Stoiko Ivanov [Thu, 7 Mar 2019 17:03:52 +0000 (18:03 +0100)]
update ZFS to 0.7.13

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
5 years agospl: drop patch already contained in 0.7.13
Stoiko Ivanov [Thu, 7 Mar 2019 17:03:51 +0000 (18:03 +0100)]
spl: drop patch already contained in 0.7.13

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
5 years agoupdate SPL to 0.7.13
Stoiko Ivanov [Thu, 7 Mar 2019 17:03:50 +0000 (18:03 +0100)]
update SPL to 0.7.13

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
5 years agobuild: use dpkg-parsechangelog
Stoiko Ivanov [Thu, 7 Mar 2019 17:03:49 +0000 (18:03 +0100)]
build: use dpkg-parsechangelog

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
5 years agobuild: add kernel target
Fabian Grünbichler [Tue, 5 Feb 2019 17:28:15 +0000 (18:28 +0100)]
build: add kernel target

to extract the patched sources for module building

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agobuild: add dsc target
Fabian Grünbichler [Tue, 5 Feb 2019 16:57:16 +0000 (17:57 +0100)]
build: add dsc target

and rework build directory preparation accordingly.

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agodebian: switch to DH 10
Fabian Grünbichler [Tue, 5 Feb 2019 16:43:47 +0000 (17:43 +0100)]
debian: switch to DH 10

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agosubmodules: remove old submodule references
Fabian Grünbichler [Tue, 5 Feb 2019 16:36:21 +0000 (17:36 +0100)]
submodules: remove old submodule references

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agobuild: update Makefile for new structure
Fabian Grünbichler [Tue, 5 Feb 2019 16:31:19 +0000 (17:31 +0100)]
build: update Makefile for new structure

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agoupdate README
Fabian Grünbichler [Tue, 5 Feb 2019 16:27:25 +0000 (17:27 +0100)]
update README

to reference Debian's git repositories on salsa

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agospl/debian: add packaging files
Fabian Grünbichler [Tue, 5 Feb 2019 15:55:32 +0000 (16:55 +0100)]
spl/debian: add packaging files

based on Debian's packaging work, but simplified:
- no DKMS

and remove old patches which were based on top of Debian's packaging.

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agozfs/debian: add packaging files
Fabian Grünbichler [Wed, 30 Jan 2019 14:26:24 +0000 (15:26 +0100)]
zfs/debian: add packaging files

based on Debian's packaging work, but simplified:
- no DKMS
- no dracut
- no udebs

and remove old patches which were based on top of Debian's packaging.

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agosubmodules: add upstream mirrors
Fabian Grünbichler [Wed, 30 Jan 2019 13:25:13 +0000 (14:25 +0100)]
submodules: add upstream mirrors

pointing to ZFS on Linux's github repositories

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agospl: rebase patches on top of debian/0.7.12-1
Fabian Grünbichler [Wed, 30 Jan 2019 13:33:17 +0000 (14:33 +0100)]
spl: rebase patches on top of debian/0.7.12-1

and drop those contained in 0.7.12

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agospl: update submodule to debian/0.7.12-1
Fabian Grünbichler [Wed, 30 Jan 2019 13:29:19 +0000 (14:29 +0100)]
spl: update submodule to debian/0.7.12-1

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agozfs: rebase patches on top of 0.7.12-2
Fabian Grünbichler [Wed, 30 Jan 2019 13:25:27 +0000 (14:25 +0100)]
zfs: rebase patches on top of 0.7.12-2

and drop those that are part of 0.7.12

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
5 years agozfs: update submodule to debian/0.7.12-2
Fabian Grünbichler [Wed, 30 Jan 2019 13:28:21 +0000 (14:28 +0100)]
zfs: update submodule to debian/0.7.12-2

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>