[pve-devel] [PATCH zfsonlinux/stable-6 0/2] update zfs to 2.0.7

[pve-devel] [PATCH zfsonlinux/stable-6 0/2] update zfs to 2.0.7

[Stoiko Ivanov]

2.0.7 contains a few commits which might affect our users e.g.:
`ZFS send/recv with ashift 9->12 leads to data corruption`

the second commit is a cherry-pick from our current master
(abigail failures should not cause the build to abort)

built and booted the kernel on one of our hardware-testhosts

Aron Xu (1):
  d/rules: allow abigail to fail

Stoiko Ivanov (1):
  update submodule and patches to ZFS 2.0.7

 debian/patches/0005-Enable-zed-emails.patch     | 2 +-
 debian/patches/0007-Use-installed-python3.patch | 6 +++---
 debian/rules                                    | 2 +-
 upstream                                        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

-- 
2.30.2

[pve-devel] [PATCH zfsonlinux/stable-6 1/2] update submodule and patches to ZFS 2.0.7

[Stoiko Ivanov]

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 debian/patches/0005-Enable-zed-emails.patch     | 2 +-
 debian/patches/0007-Use-installed-python3.patch | 6 +++---
 upstream                                        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0005-Enable-zed-emails.patch b/debian/patches/0005-Enable-zed-emails.patch
index e837d7e9..f605a356 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 df560f921..4ce7af744 100644
+index 1c278b2ef..41c075c09 100644
 --- a/cmd/zed/zed.d/zed.rc
 +++ b/cmd/zed/zed.d/zed.rc
 @@ -15,7 +15,7 @@
diff --git a/debian/patches/0007-Use-installed-python3.patch b/debian/patches/0007-Use-installed-python3.patch
index 789ce2ad..a44ee403 100644
--- a/debian/patches/0007-Use-installed-python3.patch
+++ b/debian/patches/0007-Use-installed-python3.patch
@@ -28,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 f89cb3b31..375d483f7 100755
+index d52f0261a..18356b017 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
@@ -41,10 +41,10 @@ index f89cb3b31..375d483f7 100755
  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 394fe95bb..43560aac5 100755
+index 551ed15db..bd30488ea 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
+@@ -88,7 +88,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
diff --git a/upstream b/upstream
index ef686e96..ad81baab 160000
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-Subproject commit ef686e96ec1f907cac39552fa0e21298a6f38df5
+Subproject commit ad81baab7779cd2113669d30de72bb925e684525
-- 
2.30.2

[pve-devel] [PATCH zfsonlinux/stable-6 2/2] d/rules: allow abigail to fail

[Stoiko Ivanov]

From: Aron Xu <aron@debian.org>

(cherry picked from debian upstream [0]
commit 5ae98b5499022c2c127d546a7b5aeb906f6f2a6b)

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

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

diff --git a/debian/rules b/debian/rules
index 826bdc98..e5bb4a56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,7 +50,7 @@ override_dh_auto_test:
 override_dh_auto_test:
 ifeq (amd64,$(DEB_HOST_ARCH))
 	# Upstream provides an ABI guarantee that we validate here
-	$(MAKE) checkabi
+	-$(MAKE) checkabi
 endif
 
 	# The dh_auto_test rule is disabled because
-- 
2.30.2

[pve-devel] applied-series: [PATCH zfsonlinux/stable-6 0/2] update zfs to 2.0.7

[Thomas Lamprecht]

On 11.01.22 16:02, Stoiko Ivanov wrote:
> 2.0.7 contains a few commits which might affect our users e.g.:
> `ZFS send/recv with ashift 9->12 leads to data corruption`
> 
> the second commit is a cherry-pick from our current master
> (abigail failures should not cause the build to abort)
> 
> built and booted the kernel on one of our hardware-testhosts
> 
> Aron Xu (1):
>   d/rules: allow abigail to fail
> 
> Stoiko Ivanov (1):
>   update submodule and patches to ZFS 2.0.7
> 
>  debian/patches/0005-Enable-zed-emails.patch     | 2 +-
>  debian/patches/0007-Use-installed-python3.patch | 6 +++---
>  debian/rules                                    | 2 +-
>  upstream                                        | 2 +-
>  4 files changed, 6 insertions(+), 6 deletions(-)
> 

applied, thanks!