c/zfsonlinux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: c:master
Branches Tags
c:master
c:stable-7
c:stable-6
c:stable-5
c:stable-4
c:stable-3
c:zfs-2.0.6-bullseye
...
pull from: c:stable-6
Branches Tags
c:master
c:stable-7
c:stable-6
c:stable-5
c:stable-4
c:stable-3
c:zfs-2.0.6-bullseye

10 Commits
master ... stable-6

Author SHA1 Message Date
Thomas Lamprecht
8748101cc1 buildsys: fix DEBS variable name 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
(cherry picked from commit b577f030c4)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2022-01-12 19:39:12 +01:00
Thomas Lamprecht
ff279e6b9b bump version to 2.0.7-pve1 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2022-01-12 18:48:41 +01:00
Aron Xu
9b036161c8 d/rules: allow abigail to fail 
(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>
 2022-01-12 18:46:00 +01:00
Stoiko Ivanov
407d5004a2 update submodule and patches to ZFS 2.0.7 
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
 2022-01-12 18:46:00 +01:00
Thomas Lamprecht
b7ce537d24 bump version to 2.0.6-pve1~bpo10+1 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-09-28 09:19:31 +02:00
Thomas Lamprecht
6eb925bd8a drop already applied patches 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-09-28 09:18:24 +02:00
Thomas Lamprecht
a542d21db8 update submodule to zfs-2.0.6 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-09-28 09:16:51 +02:00
Thomas Lamprecht
19953df19b cherry-pick "Revert Consolidate arc_buf allocation checks" 
see https://github.com/openzfs/zfs/issues/11531

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-09-08 16:20:54 +02:00
Thomas Lamprecht
337bdb0b13 bump version to 2.0.5-pve1~bpo10+1 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-07-21 18:12:55 +02:00
Thomas Lamprecht
bc8bb69f8c buildsys: move upload target back to buster for oldstable backport 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 2021-07-21 17:57:48 +02:00
6 changed files with 29 additions and 11 deletions
Show Stats Expand all files Collapse all files

10
Makefile
View File

@ -26,13 +26,13 @@ python3-pyzfs_${ZFSPKGVER}_amd64.deb \
pyzfs-doc_${ZFSPKGVER}_all.deb \
spl_${ZFSPKGVER}_all.deb \
zfs-initramfs_${ZFSPKGVER}_all.deb
ZFS_DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
DEBS= ${ZFS_DEB1} ${ZFS_DEB2} ${ZFS_DBG_DEBS}
ZFS_DSC = zfs-linux_${ZFSPKGVER}.dsc
all: deb
.PHONY: deb
deb: ${ZFS_DEBS}
deb: ${DEBS}
.PHONY: dsc
dsc: ${ZFS_DSC}
@ -52,11 +52,11 @@ submodule:
${ZFSSRC}/README.md: submodule
.PHONY: zfs
zfs: ${ZFS_DEBS}
zfs: ${DEBS}
${ZFS_DEB2}: ${ZFS_DEB1}
${ZFS_DEB1}: ${ZFSDIR}
cd ${ZFSDIR}; dpkg-buildpackage -b -uc -us
lintian ${ZFS_DEBS}
lintian ${DEBS}
${ZFS_DSC}: ${ZFSDIR}
tar czf zfs-linux_${ZFSVER}.orig.tar.gz ${ZFSDIR}
@ -79,4 +79,4 @@ distclean: clean
.PHONY: upload
upload: ${DEBS}
tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist bullseye --arch amd64
tar -cf - ${DEBS} | ssh repoman@repo.proxmox.com -- upload --product pve,pmg,pbs --dist buster --arch amd64

18
debian/changelog vendored
View File

@ -1,3 +1,21 @@
zfs-linux (2.0.7-pve1) buster; urgency=medium
* update ZFS to 2.0.7
-- Proxmox Support Team <support@proxmox.com> Wed, 12 Jan 2022 18:46:26 +0100
zfs-linux (2.0.6-pve1~bpo10+1) buster; urgency=medium
* update ZFS to 2.0.6
-- Proxmox Support Team <support@proxmox.com> Tue, 28 Sep 2021 09:19:18 +0200
zfs-linux (2.0.5-pve1~bpo10+1) buster; urgency=medium
* Rebuild for buster based releases
-- Proxmox Support Team <support@proxmox.com> Wed, 21 Jul 2021 18:01:07 +0200
zfs-linux (2.0.5-pve1) bullseye; urgency=medium
* update ZFS to 2.0.5

2
debian/patches/0005-Enable-zed-emails.patch vendored
View File

@ -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 @@

6
debian/patches/0007-Use-installed-python3.patch vendored
View File

@ -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

2
debian/rules vendored
View File

@ -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
upstream

@ -1 +1 @@
Subproject commit e9353bc2ef27c300281574453e0cf5189a375680
Subproject commit ad81baab7779cd2113669d30de72bb925e684525