* [PR PATCH] zfs-lts: update to 2.1.15.
@ 2024-02-27 3:21 zdykstra
2024-02-27 3:23 ` zdykstra
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: zdykstra @ 2024-02-27 3:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
There is a new pull request by zdykstra against master on the void-packages repository
https://github.com/zdykstra/void-packages zfs-2.1.15
https://github.com/void-linux/void-packages/pull/48964
zfs-lts: update to 2.1.15.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
-
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (cross)
A patch file from https://github.com/void-linux/void-packages/pull/48964.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-2.1.15-48964.patch --]
[-- Type: text/x-diff, Size: 2480 bytes --]
From c092a21d8d3e76aa90509d457bc23329690e0b52 Mon Sep 17 00:00:00 2001
From: Zach Dykstra <dykstra.zachary@gmail.com>
Date: Mon, 26 Feb 2024 21:20:56 -0600
Subject: [PATCH] zfs-lts: update to 2.1.15.
---
.../patches/0003-fix-seektest-musl.patch | 30 +++++++++++++++++++
srcpkgs/zfs-lts/template | 4 +--
2 files changed, 32 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/zfs-lts/patches/0003-fix-seektest-musl.patch
diff --git a/srcpkgs/zfs-lts/patches/0003-fix-seektest-musl.patch b/srcpkgs/zfs-lts/patches/0003-fix-seektest-musl.patch
new file mode 100644
index 0000000000000..f233eec790119
--- /dev/null
+++ b/srcpkgs/zfs-lts/patches/0003-fix-seektest-musl.patch
@@ -0,0 +1,30 @@
+From 4c2cd2ce45caf8374733fb97643f2f0060cacec2 Mon Sep 17 00:00:00 2001
+From: Zach Dykstra <dykstra.zachary@gmail.com>
+Date: Thu, 22 Feb 2024 16:31:02 -0600
+Subject: [PATCH] zfs-tests: fix seekflood.c on MUSL
+
+---
+ tests/zfs-tests/tests/functional/cp_files/seekflood.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/tests/zfs-tests/tests/functional/cp_files/seekflood.c b/tests/zfs-tests/tests/functional/cp_files/seekflood.c
+index 02c2c8e6e..d3116d9fd 100644
+--- a/tests/zfs-tests/tests/functional/cp_files/seekflood.c
++++ b/tests/zfs-tests/tests/functional/cp_files/seekflood.c
+@@ -27,6 +27,14 @@
+ #define _GNU_SOURCE
+ #endif
+
++#ifndef SEEK_DATA
++#define SEEK_DATA 3
++#endif
++
++#ifndef SEEK_HOLE
++#define SEEK_HOLE 4
++#endif
++
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <stdio.h>
+--
+2.43.2
diff --git a/srcpkgs/zfs-lts/template b/srcpkgs/zfs-lts/template
index 91e4f66a623e9..983d8bed73151 100644
--- a/srcpkgs/zfs-lts/template
+++ b/srcpkgs/zfs-lts/template
@@ -1,6 +1,6 @@
# Template file for 'zfs-lts'
pkgname=zfs-lts
-version=2.1.14
+version=2.1.15
revision=1
build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin
@@ -16,7 +16,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=509fed100e73477621bfb56c58346a3306727dbb6f7e017ba714101babb6ea3f
+checksum=374f92fde42600103ba4d184cb4841d648b8849320b504d10690f17e30e51ad3
# dkms must be before initramfs-regenerate to build modules before images
triggers="dkms initramfs-regenerate"
dkms_modules="zfs ${version}"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: zfs-lts: update to 2.1.15.
2024-02-27 3:21 [PR PATCH] zfs-lts: update to 2.1.15 zdykstra
@ 2024-02-27 3:23 ` zdykstra
2024-02-27 3:23 ` zdykstra
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: zdykstra @ 2024-02-27 3:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New comment by zdykstra on void-packages repository
https://github.com/void-linux/void-packages/pull/48964#issuecomment-1965718585
Comment:
Tested root-on-ZFS with ZFSBootMenu, x86_64 - works as expected. Could use additional tests, espcially from people not booting from ZFS / not on x86_64.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: zfs-lts: update to 2.1.15.
2024-02-27 3:21 [PR PATCH] zfs-lts: update to 2.1.15 zdykstra
2024-02-27 3:23 ` zdykstra
@ 2024-02-27 3:23 ` zdykstra
2024-02-28 17:13 ` zdykstra
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: zdykstra @ 2024-02-27 3:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 296 bytes --]
New comment by zdykstra on void-packages repository
https://github.com/void-linux/void-packages/pull/48964#issuecomment-1965718585
Comment:
Tested root-on-ZFS with ZFSBootMenu, x86_64 - works as expected. Could use additional tests, especially from people not booting from ZFS / not on x86_64.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: zfs-lts: update to 2.1.15.
2024-02-27 3:21 [PR PATCH] zfs-lts: update to 2.1.15 zdykstra
2024-02-27 3:23 ` zdykstra
2024-02-27 3:23 ` zdykstra
@ 2024-02-28 17:13 ` zdykstra
2024-02-29 6:27 ` [PR PATCH] [Merged]: " Vaelatern
2024-02-29 6:27 ` Vaelatern
4 siblings, 0 replies; 6+ messages in thread
From: zdykstra @ 2024-02-28 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 398 bytes --]
New comment by zdykstra on void-packages repository
https://github.com/void-linux/void-packages/pull/48964#issuecomment-1969464121
Comment:
Looking through recent issues on [openzfs/zfs](https://github.com/openzfs/zfs/issues?q=is%3Aopen+is%3Aissue) I'm not seeing anything for 2.1.15. This seems _relatively_ safe to merge as-is.
@Vaelatern ready for your review / any testing you do locally!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: zfs-lts: update to 2.1.15.
2024-02-27 3:21 [PR PATCH] zfs-lts: update to 2.1.15 zdykstra
` (2 preceding siblings ...)
2024-02-28 17:13 ` zdykstra
@ 2024-02-29 6:27 ` Vaelatern
2024-02-29 6:27 ` Vaelatern
4 siblings, 0 replies; 6+ messages in thread
From: Vaelatern @ 2024-02-29 6:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 499 bytes --]
There's a merged pull request on the void-packages repository
zfs-lts: update to 2.1.15.
https://github.com/void-linux/void-packages/pull/48964
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
-
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl (cross)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: zfs-lts: update to 2.1.15.
2024-02-27 3:21 [PR PATCH] zfs-lts: update to 2.1.15 zdykstra
` (3 preceding siblings ...)
2024-02-29 6:27 ` [PR PATCH] [Merged]: " Vaelatern
@ 2024-02-29 6:27 ` Vaelatern
4 siblings, 0 replies; 6+ messages in thread
From: Vaelatern @ 2024-02-29 6:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 151 bytes --]
New comment by Vaelatern on void-packages repository
https://github.com/void-linux/void-packages/pull/48964#issuecomment-1970490200
Comment:
Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-29 6:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-27 3:21 [PR PATCH] zfs-lts: update to 2.1.15 zdykstra
2024-02-27 3:23 ` zdykstra
2024-02-27 3:23 ` zdykstra
2024-02-28 17:13 ` zdykstra
2024-02-29 6:27 ` [PR PATCH] [Merged]: " Vaelatern
2024-02-29 6:27 ` 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).