public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Christian Ebner <c.ebner@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [PATCH proxmox-backup-restore-image 1/5] update ZFS to 2.4.2
Date: Thu, 14 May 2026 17:25:06 +0200	[thread overview]
Message-ID: <20260514152510.2273112-2-c.ebner@proxmox.com> (raw)
In-Reply-To: <20260514152510.2273112-1-c.ebner@proxmox.com>

This upstream version is compatible with Linux kernels 7.0.

Bump submodule commit and adapt patch to drop libudev reference so it
applies again.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
---
 .../0001-remove-reference-to-libudev.patch    | 20 ++++++++++++-------
 src/submodules/zfsonlinux                     |  2 +-
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/patches/zfs/0001-remove-reference-to-libudev.patch b/src/patches/zfs/0001-remove-reference-to-libudev.patch
index 8fe9b31..bf0e3f5 100644
--- a/src/patches/zfs/0001-remove-reference-to-libudev.patch
+++ b/src/patches/zfs/0001-remove-reference-to-libudev.patch
@@ -8,18 +8,21 @@ since there's no command line flag I can see...
 Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
 [ SI adapt to aebd94cc8541e0ec3b1de57edbd57c4280213089 ]
 Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
+[ CE adapt to 6330a45b06d20125de679aae5f63ba14082671ef ]
+Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
 ---
- config/user-libudev.m4 | 17 -----------------
+ config/user-libudev.m4 | 18 ------------------
  config/user.m4         |  1 -
- 2 files changed, 18 deletions(-)
+ 2 files changed, 19 deletions(-)
  delete mode 100644 config/user-libudev.m4
 
 diff --git a/config/user-libudev.m4 b/config/user-libudev.m4
 deleted file mode 100644
-index 8c3c1d7e0..000000000
+index 784cf4651..000000000
 --- a/config/user-libudev.m4
 +++ /dev/null
-@@ -1,17 +0,0 @@
+@@ -1,18 +0,0 @@
+-dnl # SPDX-License-Identifier: CDDL-1.0
 -dnl #
 -dnl # Check for libudev - needed for vdev auto-online and auto-replace
 -dnl #
@@ -38,14 +41,17 @@ index 8c3c1d7e0..000000000
 -	])
 -])
 diff --git a/config/user.m4 b/config/user.m4
-index 6ec27a5b2..46244f19b 100644
+index 1ecd4ddde..ab7f39a5a 100644
 --- a/config/user.m4
 +++ b/config/user.m4
-@@ -14,7 +14,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
+@@ -15,7 +15,6 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
  	AM_COND_IF([BUILD_LINUX], [
  		ZFS_AC_CONFIG_USER_UDEV
  		ZFS_AC_CONFIG_USER_SYSTEMD
 -		ZFS_AC_CONFIG_USER_LIBUDEV
  		ZFS_AC_CONFIG_USER_LIBUUID
  		ZFS_AC_CONFIG_USER_LIBBLKID
- 	])
+ 		ZFS_AC_CONFIG_USER_STATX
+-- 
+2.47.3
+
diff --git a/src/submodules/zfsonlinux b/src/submodules/zfsonlinux
index 1af41fd..6330a45 160000
--- a/src/submodules/zfsonlinux
+++ b/src/submodules/zfsonlinux
@@ -1 +1 @@
-Subproject commit 1af41fd203639818aa28cc624f144ef604a166d8
+Subproject commit 6330a45b06d20125de679aae5f63ba14082671ef
-- 
2.47.3





  reply	other threads:[~2026-05-14 15:25 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-14 15:25 [RFC proxmox{-backup-restore-image,-backup} 0/5] fix #7544: provide fallback to ntfs-3g for file-restore VM Christian Ebner
2026-05-14 15:25 ` Christian Ebner [this message]
2026-05-14 15:25 ` [PATCH proxmox-backup-restore-image 2/5] update kernel to Ubuntu-7.0.0-17.17 Christian Ebner
2026-05-14 15:25 ` [PATCH proxmox-backup-restore-image 3/5] config: enable FUSE support to allow using ntfs-3g Christian Ebner
2026-05-14 15:25 ` [PATCH proxmox-backup-restore-image 4/5] initramfs: add ntfs-3g as build dependency Christian Ebner
2026-05-14 15:25 ` [PATCH proxmox-backup 5/5] fix #7533: restore-daemon: last resort fallback to mount via ntfs-3g Christian Ebner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260514152510.2273112-2-c.ebner@proxmox.com \
    --to=c.ebner@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal