* [PR PATCH] zfs: update to 2.1.5.
@ 2022-06-23 1:45 ahesford
2022-06-23 5:13 ` HadetTheUndying
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: ahesford @ 2022-06-23 1:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 543 bytes --]
There is a new pull request by ahesford against master on the void-packages repository
https://github.com/ahesford/void-packages zfs-2.1.5
https://github.com/void-linux/void-packages/pull/37647
zfs: update to 2.1.5.
This should clear a (the?) blocker for bumping `linux` to `linux5.18`. Should be tested on `linux5.18`.
cc: @Vaelatern @leahneukirchen @ericonr @zdykstra
#### Testing the changes
- I tested the changes in this PR: **briefly**
A patch file from https://github.com/void-linux/void-packages/pull/37647.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-2.1.5-37647.patch --]
[-- Type: text/x-diff, Size: 2898 bytes --]
From 8db6224b3215c941abf8b3d934d1f889725023b0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 22 Jun 2022 21:41:38 -0400
Subject: [PATCH] zfs: update to 2.1.5.
---
...001-only-build-the-module-in-dkms.conf.patch | 17 +++++++++--------
srcpkgs/zfs/template | 4 ++--
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch b/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
index cd9e890ab76e..944618bb86c1 100644
--- a/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
+++ b/srcpkgs/zfs/patches/0001-only-build-the-module-in-dkms.conf.patch
@@ -1,4 +1,9 @@
-# Patch from https://aur.archlinux.org/cgit/aur.git/tree/0001-only-build-the-module-in-dkms.conf.patch?h=zfs-dkms
+# Patch adapted from
+#
+# https://aur.archlinux.org/cgit/aur.git/tree/0001-only-build-the-module-in-dkms.conf.patch?h=zfs-dkms
+#
+# rebased for zfs-2.1.5.
+#
# Avoids recompiling ZFS userland utilities with DKMS rebuilds
From b4a2c0b184c9c9599421b15a430fb88deb5dbd17 Mon Sep 17 00:00:00 2001
From: Eli Schwartz <eschwartz@archlinux.org>
@@ -10,10 +15,9 @@ Subject: [PATCH] only build the module in dkms.conf
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf
-index 88c289383..5a859a0e0 100755
--- a/scripts/dkms.mkconf
+++ b/scripts/dkms.mkconf
-@@ -28,14 +28,7 @@ PACKAGE_CONFIG="${pkgcfg}"
+@@ -28,14 +28,7 @@
PRE_BUILD="configure
--prefix=/usr
--with-config=kernel
@@ -29,15 +33,12 @@ index 88c289383..5a859a0e0 100755
--with-linux-obj="\${kernel_source_dir}"
\$(
[[ -n \"\${ICP_ROOT}\" ]] && \\
-@@ -69,7 +54,7 @@ POST_BUILD="scripts/dkms.postbuild
+@@ -68,7 +61,7 @@
+ -t \${dkms_tree}
"
AUTOINSTALL="yes"
- REMAKE_INITRD="no"
-MAKE[0]="make"
+MAKE[0]="make -C module/"
STRIP[0]="\$(
[[ -r \${PACKAGE_CONFIG} ]] \\
&& source \${PACKAGE_CONFIG} \\
---
-2.19.1
-
diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 6c7b69345fd3..c1e89d1e5faa 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,6 +1,6 @@
# Template file for 'zfs'
pkgname=zfs
-version=2.1.4
+version=2.1.5
revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -15,7 +15,7 @@ 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=3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6
+checksum=1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: zfs: update to 2.1.5.
2022-06-23 1:45 [PR PATCH] zfs: update to 2.1.5 ahesford
@ 2022-06-23 5:13 ` HadetTheUndying
2022-06-23 14:29 ` zdykstra
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: HadetTheUndying @ 2022-06-23 5:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 222 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/37647#issuecomment-1163939042
Comment:
Was able to boot into 5.18 doesn't appear to be doing anything unwanted.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: zfs: update to 2.1.5.
2022-06-23 1:45 [PR PATCH] zfs: update to 2.1.5 ahesford
2022-06-23 5:13 ` HadetTheUndying
@ 2022-06-23 14:29 ` zdykstra
2022-06-24 0:29 ` HadetTheUndying
2022-06-24 0:39 ` [PR PATCH] [Merged]: " Vaelatern
3 siblings, 0 replies; 5+ messages in thread
From: zdykstra @ 2022-06-23 14:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New comment by zdykstra on void-packages repository
https://github.com/void-linux/void-packages/pull/37647#issuecomment-1164481376
Comment:
Tested here under largely the same circumstances as others. Built ZFS for `linux5.18` and successfully booted it, un-encrypted.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: zfs: update to 2.1.5.
2022-06-23 1:45 [PR PATCH] zfs: update to 2.1.5 ahesford
2022-06-23 5:13 ` HadetTheUndying
2022-06-23 14:29 ` zdykstra
@ 2022-06-24 0:29 ` HadetTheUndying
2022-06-24 0:39 ` [PR PATCH] [Merged]: " Vaelatern
3 siblings, 0 replies; 5+ messages in thread
From: HadetTheUndying @ 2022-06-24 0:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
New comment by HadetTheUndying on void-packages repository
https://github.com/void-linux/void-packages/pull/37647#issuecomment-1165041892
Comment:
> Tested here under largely the same circumstances as others. Built ZFS for `linux5.18` and successfully booted it, un-encrypted.
I should add in that my ZFS pool is encrypted and decrypted fine, and I was able to test a snapshot and roll back as well.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Merged]: zfs: update to 2.1.5.
2022-06-23 1:45 [PR PATCH] zfs: update to 2.1.5 ahesford
` (2 preceding siblings ...)
2022-06-24 0:29 ` HadetTheUndying
@ 2022-06-24 0:39 ` Vaelatern
3 siblings, 0 replies; 5+ messages in thread
From: Vaelatern @ 2022-06-24 0:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 388 bytes --]
There's a merged pull request on the void-packages repository
zfs: update to 2.1.5.
https://github.com/void-linux/void-packages/pull/37647
Description:
This should clear a (the?) blocker for bumping `linux` to `linux5.18`. Should be tested on `linux5.18`.
cc: @Vaelatern @leahneukirchen @ericonr @zdykstra
#### Testing the changes
- I tested the changes in this PR: **briefly**
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-06-24 0:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-23 1:45 [PR PATCH] zfs: update to 2.1.5 ahesford
2022-06-23 5:13 ` HadetTheUndying
2022-06-23 14:29 ` zdykstra
2022-06-24 0:29 ` HadetTheUndying
2022-06-24 0:39 ` [PR PATCH] [Merged]: " Vaelatern
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).