feat: update for new pkgs, ZFS 2.3.2

Sync with pkgs main.

Signed-off-by: Andrey Smirnov <[email protected]>
(cherry picked from commit e908223)

Author: smira

.kres.yaml

@@ -78,11 +78,11 @@ spec:
       - name: EXTENSIONS_IMAGE_REF
         defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
       - name: PKGS
-        defaultValue: v1.10.0-8-g13e9f09
+        defaultValue: v1.10.0-12-gb425b44
       - name: PKGS_PREFIX
         defaultValue: ghcr.io/siderolabs
       - name: TOOLS
-        defaultValue: v1.10.0-1-g67d3f5a
+        defaultValue: v1.10.0-2-gfa51331
       - name: TOOLS_PREFIX
         defaultValue: ghcr.io/siderolabs
   useBldrPkgTagResolver: true

Makefile

@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2025-05-05T11:57:15Z by kres 1a0156b.
+# Generated on 2025-05-16T09:14:17Z by kres 5ad3e5f.
 
 # common variables
 
@@ -50,9 +50,9 @@ COMMON_ARGS += --build-arg=TOOLS_PREFIX="$(TOOLS_PREFIX)"
 # extra variables
 
 EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
-PKGS ?= v1.10.0-8-g13e9f09
+PKGS ?= v1.10.0-12-gb425b44
 PKGS_PREFIX ?= ghcr.io/siderolabs
-TOOLS ?= v1.10.0-1-g67d3f5a
+TOOLS ?= v1.10.0-2-gfa51331
 TOOLS_PREFIX ?= ghcr.io/siderolabs
 
 # targets defines all the available targets

Pkgfile

@@ -6,9 +6,9 @@ vars:
   CONTAINERD_VERSION: v2.0.5 # update this when updating PKGS_VERSION in Makefile
   LINUX_FIRMWARE_VERSION: "20250410" # update this when updating PKGS_VERSION in Makefile
   DRBD_DRIVER_VERSION: 9.2.13 # update this when updating PKGS_VERSION in Makefile
-  ZFS_DRIVER_VERSION: 2.3.1 # update this when updating PKGS_VERSION in Makefile
-  ZFS_TOOLS_SHA256: 053233799386920bdc636e22d0e19a8c2c3e642e8bd847ff87e108f8bb1f9006
-  ZFS_TOOLS_SHA512: 235023dbe97b3f7c5273e2a6fa34957cc37967256845d4ed9faa2e2a6da29ea6fdcba4167658cf03129afbb0aa11311a760d3d0b5ea5aecc64a4c7ee22ad2d31
+  ZFS_DRIVER_VERSION: 2.3.2 # update this when updating PKGS_VERSION in Makefile
+  ZFS_TOOLS_SHA256: 80da628a9543ec3355bf410617450e167706948ceb287541455a1b8d87b8758a
+  ZFS_TOOLS_SHA512: 94311f2eca1488be83aa0cb802b4a4541bbbd061a3e8e5cbda62cabbb0c8f9a705372ad192cb77703b3d7642c43be7f604f3c363b243cf03a6aceae2d7e5db81
   UTIL_LINUX_VERSION: 2.40.4 # update this when updating PKGS_VERSION in Makefile
   UTIL_LINUX_SHA256: 5c1daf733b04e9859afdc3bd87cc481180ee0f88b5c0946b16fdec931975fb79
   UTIL_LINUX_SHA512: 0024955056ba7b4c54040a917f9919f49692e57ba6d42d17a6c29c1eefe88bf48b1214a545072b71c468829a63a8f15237f49733e9127c134e11126d1e435124

storage/zfs/zfs-tools/patches/tests-fix-S_IFMT-undeclared-at-statx.c.patch

@@ -0,0 +1,38 @@
+From 634c172ee89f5303493a75dc7ff55e0a355b503a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Luis=20Salvador=20Rufo?=
+ <[email protected]>
+Date: Fri, 2 May 2025 23:49:25 +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.
+
+Reviewed-by: Rob Norris <[email protected]>
+Reviewed-by: George Melikov <[email protected]>
+Reviewed-by: Alexander Motin <[email protected]>
+Signed-off-by: José Luis Salvador Rufo <[email protected]>
+Closes #17293
+Closes #17294
+---
+ 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;

storage/zfs/zfs-tools/pkg.yaml

@@ -18,6 +18,8 @@ steps:
     prepare:
       - |
         tar -xf zfs.tar.gz --strip-components=1
+      - |
+        patch -p1 < /pkg/patches/tests-fix-S_IFMT-undeclared-at-statx.c.patch
     build:
       - |
         ./configure \
@@ -26,7 +28,6 @@ steps:
           --with-udevruledir=/usr/lib/udev/rules.d \
           --with-config=user \
           --disable-code-coverage \
-          --disable--sysvinit \
           --disable-systemd
 
         make -j $(nproc)