mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-08-08 00:20:38 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/zfs: bump version to 2.3.3

Browse Source 
Removed backported patch:
- 0001-fix-S_IFMT-undeclared-at-statx_c.patch
Merged upstream in:
a2593c1610

For release note, see:
https://github.com/openzfs/zfs/releases/tag/zfs-2.3.3

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
[Julien: add link to upstream commit of the removed patch]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
José Luis Salvador Rufo
2025-06-19 23:28:24 +02:00
committed by Julien Olivain
parent 477a0cad13
commit 255fa16028
3 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
package/zfs/0001-fix-S_IFMT-undeclared-at-statx_c.patch
View File

@@ -1,36 +0,0 @@
From 8e9fcdac6f7bbc4ec92e89b8cdce1dcc404f1999 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?=
<salvador.joseluis@gmail.com>
Date: Fri, 2 May 2025 08:10:08 +0200
Subject: [PATCH] tests: fix `S_IFMT` undeclared at `statx.c`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
`S_IFMT` is declared in `sys/stat.h`, but we cannot include this header
because it redeclares the `statx` function with different argument
types. Therefore, we define `S_IFMT` ourselves, in the same way as the
other definitions.
Closes: #17293
Upstream: https://github.com/openzfs/zfs/commit/634c172ee89f5303493a75dc7ff55e0a355b503a
Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
---
tests/zfs-tests/cmd/statx.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tests/zfs-tests/cmd/statx.c b/tests/zfs-tests/cmd/statx.c
index 89939f6efb40..1acc7e58c5ce 100644
--- a/tests/zfs-tests/cmd/statx.c
+++ b/tests/zfs-tests/cmd/statx.c
@@ -109,6 +109,9 @@ _statx(int fd, const char *path, int flags, unsigned int mask, void *stx)
#ifndef STATX_DIOALIGN
#define STATX_DIOALIGN (1<<13)
#endif
+#ifndef S_IFMT
+#define S_IFMT 0170000
+#endif
typedef struct {
int64_t tv_sec;

4
package/zfs/zfs.hash
View File

@@ -1,5 +1,5 @@
# From https://github.com/openzfs/zfs/releases/download/zfs-2.3.2/zfs-2.3.2.sha256.asc
sha256 80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a zfs-2.3.2.tar.gz
# From https://github.com/openzfs/zfs/releases/download/zfs-2.3.3/zfs-2.3.3.sha256.asc
sha256 844122118f0ea81205a01753bbcb1315330f8967c1f866dcd10155273131f071 zfs-2.3.3.tar.gz
# Hash for license files:
sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE

2
package/zfs/zfs.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
ZFS_VERSION = 2.3.2
ZFS_VERSION = 2.3.3
ZFS_SITE = https://github.com/openzfs/zfs/releases/download/zfs-$(ZFS_VERSION)
ZFS_SELINUX_MODULES = zfs
ZFS_LICENSE = CDDL