feat: update ZFS in extensions to 2.2.7

Stable release compatible with Linux 6.12. Signed-off-by: Andrey Smirnov <[email protected]>
siderolabs · Dec 12, 2024 · c7dcaaa · c7dcaaa
1 parent 1dd6c36
commit c7dcaaa
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/.kres.yaml b/.kres.yaml
@@ -65,7 +65,7 @@ spec:
       - name: EXTENSIONS_IMAGE_REF
         defaultValue: $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
       - name: PKGS
-        defaultValue: v1.10.0-alpha.0-6-g1a55529
+        defaultValue: v1.10.0-alpha.0-8-g8c31321
       - name: PKGS_PREFIX
         defaultValue: ghcr.io/siderolabs
   useBldrPkgTagResolver: true

diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-12-11T16:03:30Z by kres 8183c20.
+# Generated on 2024-12-12T11:54:21Z by kres 8183c20.
 
 # common variables
 
@@ -50,7 +50,7 @@ COMMON_ARGS += --build-arg=PKGS_PREFIX="$(PKGS_PREFIX)"
 # extra variables
 
 EXTENSIONS_IMAGE_REF ?= $(REGISTRY_AND_USERNAME)/extensions:$(TAG)
-PKGS ?= v1.10.0-alpha.0-6-g1a55529
+PKGS ?= v1.10.0-alpha.0-8-g8c31321
 PKGS_PREFIX ?= ghcr.io/siderolabs
 
 # targets defines all the available targets

diff --git a/Pkgfile b/Pkgfile
@@ -5,7 +5,7 @@ format: v1alpha2
 vars:
   LINUX_FIRMWARE_VERSION: "20241110" # update this when updating PKGS_VERSION in Makefile
   DRBD_DRIVER_VERSION: 9.2.12 # update this when updating PKGS_VERSION in Makefile
-  ZFS_DRIVER_VERSION: 2.3.0-rc3 # update this when updating PKGS_VERSION in Makefile
+  ZFS_DRIVER_VERSION: 2.2.7 # update this when updating PKGS_VERSION in Makefile
   UTIL_LINUX_VERSION: 2.40.2 # update this when updating PKGS_VERSION in Makefile
 
   # renovate: datasource=git-tags extractVersion=^libtiprc-(?<version>.*)$ depName=git://linux-nfs.org/~steved/libtirpc

diff --git a/hack/release.toml b/hack/release.toml
@@ -57,6 +57,7 @@ NVIDIA Production: 550.127.08a
 nvidia-container-toolkit: v1.17.2
 vmtoolsd-guest-agent: v0.6.1
 DRBD: 9.2.12
+ZFS: 2.2.7
 """
 
 [make_deps]
diff --git a/storage/zfs/zfs-tools/pkg.yaml b/storage/zfs/zfs-tools/pkg.yaml
@@ -11,8 +11,8 @@ steps:
   - sources:
       - url: https://github.com/openzfs/zfs/releases/download/zfs-{{ .ZFS_DRIVER_VERSION }}/zfs-{{ .ZFS_DRIVER_VERSION }}.tar.gz
         destination: zfs.tar.gz
-        sha256: 207a3e95902c0c8b4792cbfa11a7405f155c0023702d0f0b42650da5b38d852a
-        sha512: 1ac53d3a006580f4a32fa33dddd6600d8abac401ed9fc86a2950a8241e0a9dc4a8954a32c44b28b10f22ba7c5cbd8871d9f21c13ccc291c366e9745e83431723
+        sha256: b2b8e3bfabf2a6407a0132243726cb6762547a5bd095b1b1f37eaf2a9d8f7672
+        sha512: 6493faa8e31d9c042c4e8f748d32cb9243212fdf4e0341c19568b47bcf302e60beb89940b80374610b71e1dca1ca5813f3efaddbf1a2453ceabb38381165b271
     env:
       ARCH: {{ if eq .ARCH "aarch64"}}arm64{{ else if eq .ARCH "x86_64" }}x86_64{{ else }}unsupported{{ end }}
     prepare: