GNU bug report logs - #49710
[PATCH] gnu: Update OpenZFS to 2.1.0.

Previous Next

Package: guix;

Reported by: raid5atemyhomework <raid5atemyhomework <at> protonmail.com>

Date: Fri, 23 Jul 2021 15:08:01 UTC

Severity: normal

Tags: patch

Done: Brice Waegeneire <brice <at> waegenei.re>

Bug is archived. No further changes may be made.

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 49710 in the body.
You can then email your comments to 49710 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to bug-guix <at> gnu.org:
bug#49710; Package guix. (Fri, 23 Jul 2021 15:08:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to raid5atemyhomework <raid5atemyhomework <at> protonmail.com>:
New bug report received and forwarded. Copy sent to bug-guix <at> gnu.org. (Fri, 23 Jul 2021 15:08:02 GMT) Full text and rfc822 format available.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: raid5atemyhomework <raid5atemyhomework <at> protonmail.com>
To: "bug-guix <at> gnu.org" <bug-guix <at> gnu.org>
Subject: [PATCH] gnu: Update OpenZFS to 2.1.0.
Date: Fri, 23 Jul 2021 15:07:05 +0000
From 14446422d6f7873b29d2fe04a9528de867b854b8 Mon Sep 17 00:00:00 2001
From: raid5atemyhomework <raid5atemyhomework <at> protonmail.com>
Date: Fri, 23 Jul 2021 23:01:30 +0800
Subject: [PATCH] gnu: Update OpenZFS to 2.1.0.

* gnu/packages/file-systems.scm [zfs]: Update to 2.1.0, add
support for new compatibility feature.
---
 gnu/packages/file-systems.scm | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index b6d0bcbc55..463cc3a8b5 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1171,7 +1171,7 @@ with the included @command{xfstests-check} helper.")
 (define-public zfs
   (package
     (name "zfs")
-    (version "2.0.5")
+    (version "2.1.0")
     (outputs '("out" "module" "src"))
     (source
       (origin
@@ -1180,7 +1180,7 @@ with the included @command{xfstests-check} helper.")
                               "/download/zfs-" version
                               "/zfs-" version ".tar.gz"))
           (sha256
-           (base32 "1jbfm18hh9x4a9s5d7si8lapmq2aniphyriif9flrgsff26lj5rs"))))
+           (base32 "0kzkggwznp4m3503f2m4lcinbl99jg50j4asrwfpfk1862vdrgb0"))))
     (build-system linux-module-build-system)
     (arguments
      `(;; The ZFS kernel module should not be downloaded since the license
@@ -1211,6 +1211,25 @@ with the included @command{xfstests-check} helper.")
                    (util-linux (assoc-ref inputs "util-linux"))
                    (nfs-utils  (assoc-ref inputs "nfs-utils"))
                    (kmod       (assoc-ref inputs "kmod-runtime")))
+               ;; New feature "compatibility=" in 2.1.0.
+               ;; This feature looks up in two locations:
+               ;;   /etc/zfs/compatibility.d/
+               ;;   /usr/share/zfs/compatibility.d/
+               ;; The first is intended for system-specific compatibility
+               ;; sets, while the second is what is installed with the
+               ;; OpenZFS package, so use the absolute path for the first
+               ;; (which requires patching in the file) and the store path
+               ;; for the second (which it gets by default).
+               (substitute* "include/sys/fs/zfs.h"
+                 (("#define\tZPOOL_SYSCONF_COMPAT_D.*$")
+                  ; Use absolute path.
+                  "#define\tZPOOL_SYSCONF_COMPAT_D\t\"/etc/zfs/compatibility.d\"\n"))
+               ;; Also update the manual, which uses absolute paths, so that
+               ;; /usr/share/zfs/compatibility.d/ is referred via the store.
+               (substitute* '("man/man8/zpoolprops.8"
+                              "man/man5/zpool-features.5")
+                 (("/usr/share/zfs/compatibility.d")
+                  (string-append out "/share/zfs/compatibility.d")))
                (substitute* "etc/Makefile.in"
                  ;; This just contains an example configuration file for
                  ;; configuring ZFS on traditional init systems, skip it
--
2.31.1





Information forwarded to bug-guix <at> gnu.org:
bug#49710; Package guix. (Fri, 23 Jul 2021 16:55:02 GMT) Full text and rfc822 format available.

Message #8 received at 49710 <at> debbugs.gnu.org (full text, mbox):

From: raid5atemyhomework <raid5atemyhomework <at> protonmail.com>
To: "49710 <at> debbugs.gnu.org" <49710 <at> debbugs.gnu.org>
Subject: [PATCH v2] gnu: Update OpenZFS to 2.1.0.
Date: Fri, 23 Jul 2021 16:54:13 +0000
Bleah, forgot to *completely* amend the commit that was using the release candidate...


From 14446422d6f7873b29d2fe04a9528de867b854b8 Mon Sep 17 00:00:00 2001
From: raid5atemyhomework <raid5atemyhomework <at> protonmail.com>
Date: Fri, 23 Jul 2021 23:01:30 +0800
Subject: [PATCH] gnu: Update OpenZFS to 2.1.0.

* gnu/packages/file-systems.scm [zfs]: Update to 2.1.0, add
support for new compatibility feature.
---
 gnu/packages/file-systems.scm | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index b6d0bcbc55..463cc3a8b5 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -1171,7 +1171,7 @@ with the included @command{xfstests-check} helper.")
 (define-public zfs
   (package
     (name "zfs")
-    (version "2.0.5")
+    (version "2.1.0")
     (outputs '("out" "module" "src"))
     (source
       (origin
@@ -1180,7 +1180,7 @@ with the included @command{xfstests-check} helper.")
                               "/download/zfs-" version
                               "/zfs-" version ".tar.gz"))
           (sha256
-           (base32 "1jbfm18hh9x4a9s5d7si8lapmq2aniphyriif9flrgsff26lj5rs"))))
+           (base32 "0kzkggwznp4m3503f2m4lcinbl99jg50j4asrwfpfk1862vdrgb0"))))
     (build-system linux-module-build-system)
     (arguments
      `(;; The ZFS kernel module should not be downloaded since the license
@@ -1211,6 +1211,25 @@ with the included @command{xfstests-check} helper.")
                    (util-linux (assoc-ref inputs "util-linux"))
                    (nfs-utils  (assoc-ref inputs "nfs-utils"))
                    (kmod       (assoc-ref inputs "kmod-runtime")))
+               ;; New feature "compatibility=" in 2.1.0.
+               ;; This feature looks up in two locations:
+               ;;   /etc/zfs/compatibility.d/
+               ;;   /usr/share/zfs/compatibility.d/
+               ;; The first is intended for system-specific compatibility
+               ;; sets, while the second is what is installed with the
+               ;; OpenZFS package, so use the absolute path for the first
+               ;; (which requires patching in the file) and the store path
+               ;; for the second (which it gets by default).
+               (substitute* "include/sys/fs/zfs.h"
+                 (("#define\tZPOOL_SYSCONF_COMPAT_D.*$")
+                  ; Use absolute path.
+                  "#define\tZPOOL_SYSCONF_COMPAT_D\t\"/etc/zfs/compatibility.d\"\n"))
+               ;; Also update the manual, which uses absolute paths, so that
+               ;; /usr/share/zfs/compatibility.d/ is referred via the store.
+               (substitute* '("man/man7/zpoolprops.7"
+                              "man/man7/zpool-features.7")
+                 (("/usr/share/zfs/compatibility.d")
+                  (string-append out "/share/zfs/compatibility.d")))
                (substitute* "etc/Makefile.in"
                  ;; This just contains an example configuration file for
                  ;; configuring ZFS on traditional init systems, skip it
--
2.31.1





Information forwarded to bug-guix <at> gnu.org:
bug#49710; Package guix. (Sun, 01 Aug 2021 09:43:02 GMT) Full text and rfc822 format available.

Message #11 received at 49710 <at> debbugs.gnu.org (full text, mbox):

From: raid5atemyhomework <raid5atemyhomework <at> protonmail.com>
To: "49710 <at> debbugs.gnu.org" <49710 <at> debbugs.gnu.org>
Subject: Re: [PATCH v2] gnu: Update OpenZFS to 2.1.0.
Date: Sun, 01 Aug 2021 09:41:51 +0000
BUMP




Information forwarded to bug-guix <at> gnu.org:
bug#49710; Package guix. (Mon, 02 Aug 2021 16:02:01 GMT) Full text and rfc822 format available.

Message #14 received at 49710 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: raid5atemyhomework <raid5atemyhomework <at> protonmail.com>
Cc: "49710-done <at> debbugs.gnu.org" <49710 <at> debbugs.gnu.org>
Subject: Re: bug#49710: [PATCH v2] gnu: Update OpenZFS to 2.1.0.
Date: Mon, 2 Aug 2021 19:00:04 +0300
[Message part 1 (text/plain, inline)]
Thanks. Patch pushed.

-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[signature.asc (application/pgp-signature, inline)]

bug closed, send any further explanations to 49710 <at> debbugs.gnu.org and raid5atemyhomework <raid5atemyhomework <at> protonmail.com> Request was from Brice Waegeneire <brice <at> waegenei.re> to control <at> debbugs.gnu.org. (Thu, 26 Aug 2021 18:46:01 GMT) Full text and rfc822 format available.

bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Fri, 24 Sep 2021 11:24:04 GMT) Full text and rfc822 format available.

This bug report was last modified 2 years and 186 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.