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

package/zfs: bump version to 2.3.4

Browse Source 
Added backported patch:
- 0001-use-sys_stath-instead-of-linux_stath.patch
  ccf5a8a6fc

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

Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
José Luis Salvador Rufo
2025-09-02 06:38:20 +02:00
committed by Julien Olivain
parent 498b5f3846
commit 98399d11ff
3 changed files with 85 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
package/zfs/0001-use-sys_stath-instead-of-linux_stath.patch Normal file
View File

@@ -0,0 +1,82 @@
From ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d Mon Sep 17 00:00:00 2001
From: classabbyamp <5366828+classabbyamp@users.noreply.github.com>
Date: Wed, 27 Aug 2025 17:42:32 -0400
Subject: [PATCH] linux: use sys/stat.h instead of linux/stat.h
glibc includes linux/stat.h for statx, but musl defines its own statx
struct and associated constants, which does not include STATX_MNT_ID
yet. Thus, including linux/stat.h directly should be avoided for
maximum libc compatibility.
Tested on:
- glibc: x86_64, i686, aarch64, armv7l, armv6l
- musl: x86_64, aarch64, armv7l, armv6l
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Tested-By: Achill Gilgenast <achill@achill.org>
Signed-off-by: classabbyamp <dev@placeviolette.net>
Closes #17675
Upstream: https://github.com/openzfs/zfs/commit/ccf5a8a6fcfdfbdaa2f0fdca5d787958224bf06d
Signed-off-by: José Luis Salvador Rufo <salvador.joseluis@gmail.com>
---
config/user-statx.m4 | 6 +++---
include/os/linux/spl/sys/stat.h | 2 +-
lib/libspl/include/os/linux/sys/stat.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/config/user-statx.m4 b/config/user-statx.m4
index 0315f93e0c20..1ba74a40e9b8 100644
--- a/config/user-statx.m4
+++ b/config/user-statx.m4
@@ -2,7 +2,7 @@ dnl #
dnl # Check for statx() function and STATX_MNT_ID availability
dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [
- AC_CHECK_HEADERS([linux/stat.h],
+ AC_CHECK_HEADERS([sys/stat.h],
[have_stat_headers=yes],
[have_stat_headers=no])
@@ -14,7 +14,7 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [
AC_MSG_CHECKING([for STATX_MNT_ID])
AC_COMPILE_IFELSE([
AC_LANG_PROGRAM([[
- #include <linux/stat.h>
+ #include <sys/stat.h>
]], [[
struct statx stx;
int mask = STATX_MNT_ID;
@@ -29,6 +29,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER_STATX], [
])
])
], [
- AC_MSG_WARN([linux/stat.h not found; skipping statx support])
+ AC_MSG_WARN([sys/stat.h not found; skipping statx support])
])
]) dnl end AC_DEFUN
diff --git a/include/os/linux/spl/sys/stat.h b/include/os/linux/spl/sys/stat.h
index 087389b57b34..ad2815e46394 100644
--- a/include/os/linux/spl/sys/stat.h
+++ b/include/os/linux/spl/sys/stat.h
@@ -25,6 +25,6 @@
#ifndef _SPL_STAT_H
#define _SPL_STAT_H
-#include <linux/stat.h>
+#include <sys/stat.h>
#endif /* SPL_STAT_H */
diff --git a/lib/libspl/include/os/linux/sys/stat.h b/lib/libspl/include/os/linux/sys/stat.h
index a605af962a6d..13cc0b46ac93 100644
--- a/lib/libspl/include/os/linux/sys/stat.h
+++ b/lib/libspl/include/os/linux/sys/stat.h
@@ -33,7 +33,7 @@
#ifdef HAVE_STATX
#include <fcntl.h>
-#include <linux/stat.h>
+#include <sys/stat.h>
#endif
/*

4
package/zfs/zfs.hash
View File

@@ -1,5 +1,5 @@
# 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
# From https://github.com/openzfs/zfs/releases/download/zfs-2.3.4/zfs-2.3.4.sha256.asc
sha256 9ec397cf360133161a1180035f3e7d6962186ed2b3457953a28d45aa883fa495 zfs-2.3.4.tar.gz
# Hash for license files:
sha256 1ffb70c33c4f79f04e947facc5c7851f289609256aacb47fc115f700427d9520 LICENSE

2
package/zfs/zfs.mk
View File

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