From: ahesford <ahesford@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] zfs: upgrade to 2.1.0
Date: Sat, 03 Jul 2021 05:17:36 +0200 [thread overview]
Message-ID: <20210703031736.W26LQboOs-he9SVCcmWZoNx3RJZMv9K29Kag49aXjtI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31771@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
There is an updated pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages zfs-2.1.0
https://github.com/void-linux/void-packages/pull/31771
zfs: upgrade to 2.1.0
Works on `x86_64` and within ZFSBootMenu. Adds a few new features so could use a bit of testing.
cc: @Vaelatern @ericonr @zdykstra
A patch file from https://github.com/void-linux/void-packages/pull/31771.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-2.1.0-31771.patch --]
[-- Type: text/x-diff, Size: 2544 bytes --]
From 257267a4b8965a896123f427156869964edc42cb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jul 2021 16:59:39 -0400
Subject: [PATCH 1/2] zfs: update to 2.1.0.
---
common/shlibs | 2 +-
srcpkgs/zfs/template | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 798fa9601f56..2463c7535163 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3848,7 +3848,7 @@ libtss2-tctildr.so.0 tpm2-tss-2.3.1_1
libzfsbootenv.so.1 zfs-2.0.3_2
libzfs.so.4 zfs-2.0.3_2
libuutil.so.3 zfs-2.0.3_2
-libzpool.so.4 zfs-2.0.3_2
+libzpool.so.5 zfs-2.1.0_1
libzfs_core.so.3 zfs-2.0.3_2
libnvpair.so.3 zfs-2.0.3_2
libgmio.so gmio-0.4.1_1
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index b25cb8d88177..79cf6830f10a 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
# Template file for 'zfs'
pkgname=zfs
-version=2.0.5
+version=2.1.0
revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,13 +15,17 @@ maintainer="Toyam Cox <Vaelatern@voidlinux.org>"
license="CDDL-1.0"
homepage="https://openzfs.github.io/openzfs-docs/"
distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz"
-checksum=3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9
+checksum=60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0
+if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+ makedepends+=" libatomic-devel"
+fi
+
post_patch() {
# When collecting a "clean" tree for DKMS, don't leave patches in place
local _f
From 2bcd7b670644d333290412cea784161b611fc1d4 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jul 2021 23:17:11 -0400
Subject: [PATCH 2/2] pam_zfscrypt: revbump for zfs-2.1.0
---
srcpkgs/pam_zfscrypt/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pam_zfscrypt/template b/srcpkgs/pam_zfscrypt/template
index ec272c357fe9..eb22650a7228 100644
--- a/srcpkgs/pam_zfscrypt/template
+++ b/srcpkgs/pam_zfscrypt/template
@@ -1,7 +1,7 @@
# Template file for 'pam_zfscrypt'
pkgname=pam_zfscrypt
version=0.2.0
-revision=2
+revision=3
wrksrc="zfscrypt-${version}"
build_style=gnu-makefile
makedepends="pam-devel zfs-devel"
next prev parent reply other threads:[~2021-07-03 3:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-03 2:48 [PR PATCH] " ahesford
2021-07-03 3:17 ` ahesford [this message]
2021-07-03 4:03 ` zdykstra
2021-07-03 4:12 ` [PR PATCH] [Updated] " ahesford
2021-07-03 4:17 ` ericonr
2021-07-04 4:39 ` Vaelatern
2021-07-04 13:40 ` ahesford
2021-07-04 19:29 ` ericonr
2021-07-04 23:06 ` Vaelatern
2021-07-08 14:00 ` ahesford
2021-07-08 14:00 ` [PR PATCH] [Merged]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210703031736.W26LQboOs-he9SVCcmWZoNx3RJZMv9K29Kag49aXjtI@z \
--to=ahesford@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).