From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id mBUVAXH0+mAmMAAAgWs5BA (envelope-from ) for ; Fri, 23 Jul 2021 18:55:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id QrpxOHD0+mAVCAAAB5/wlQ (envelope-from ) for ; Fri, 23 Jul 2021 16:55:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3E5BFEEDD for ; Fri, 23 Jul 2021 18:55:12 +0200 (CEST) Received: from localhost ([::1]:59292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6yS6-0005ZM-6n for larch@yhetil.org; Fri, 23 Jul 2021 12:55:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6yRy-0005ZD-Iv for bug-guix@gnu.org; Fri, 23 Jul 2021 12:55:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32922) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6yRy-0000dx-BQ for bug-guix@gnu.org; Fri, 23 Jul 2021 12:55:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m6yRy-0000Aq-Aw for bug-guix@gnu.org; Fri, 23 Jul 2021 12:55:02 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#49710: [PATCH v2] gnu: Update OpenZFS to 2.1.0. References: In-Reply-To: Resent-From: raid5atemyhomework Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 23 Jul 2021 16:55:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49710 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: "49710@debbugs.gnu.org" <49710@debbugs.gnu.org> Received: via spool by 49710-submit@debbugs.gnu.org id=B49710.1627059277634 (code B ref 49710); Fri, 23 Jul 2021 16:55:02 +0000 Received: (at 49710) by debbugs.gnu.org; 23 Jul 2021 16:54:37 +0000 Received: from localhost ([127.0.0.1]:44468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6yRY-0000A9-Hc for submit@debbugs.gnu.org; Fri, 23 Jul 2021 12:54:37 -0400 Received: from mail-4325.protonmail.ch ([185.70.43.25]:43981) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6yRQ-00009q-Q9 for 49710@debbugs.gnu.org; Fri, 23 Jul 2021 12:54:35 -0400 Date: Fri, 23 Jul 2021 16:54:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1627059261; bh=fCRDFqt814YGo79n7QhFQi+ZoIHI57zKO16xaAKrNq0=; h=Date:To:From:Reply-To:Subject:From; b=aOMzoR87fy8PccWc4tZ8oWf8UL5KdpsoeVtWSVJY3YnXzXc6pulgtQDJL9AFjoeBt Y5SpCuPQq2pGXZdD90x7rXabXDF6t5ApgLDVQRMxn1fTGvCgl3IdSHIVxvzQqQbSbs jUycP1J8gHbNtO2R5wDuW1xsF8urW9ND2Ux5NcjM= Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" Reply-to: raid5atemyhomework X-ACL-Warn: , raid5atemyhomework From: raid5atemyhomework via Bug reports for GNU Guix X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627059312; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=fCRDFqt814YGo79n7QhFQi+ZoIHI57zKO16xaAKrNq0=; b=ij15SxHZLsNN8IKuQoLuBo1t/9jXri8TKtiPP+yCy/mhsB99M9U9pUYTSfht/isxmkzcxa TrZXIpzqi7dNFOXnUP7eY/L9V37WP1liAkJ+YJZsvHZefO1u4YJ93yHvfvWnkxT4MZAJAa aEnt2rVA0qxt3g4xxtw4mfFuHy+Pvn2pINGkFKo3LE/qe1w4/E9j5Le52CanSrLC1l5gUl TgtWfxAvIq4M0Jf5J0ypB2aKOIdtdeSIcluhazbNUawYC6PHzXsKb8B8lBmXYZiIqrYrPi zFgn8VKqcZlH3inF41VDaF3beRdTOTHNRddaHI9DGJh/s86zUeGRr8P0eqIhCA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627059312; a=rsa-sha256; cv=none; b=FqGbWeh/9IpOHY2FUTUpIxOod9cg62rLMk1d5bg34wlVJrSYT+LM8/g9NDc2uigUVlwqTS PogTF2YvQStNJNPbSsgTJmJn6i+VyC88vQI0x6SOO2QUPRKJq3k/JydhIU+ssG70/XDB6v NodWVM5b33eh+B9jM0hEWm9jZdVvOYgoU2ByIQy9w1lvkjUXBkdZtUGDmuG2bQbkqN2Gmz goXJBFLDNIsCEdbBMX8mkkA8BvHbat6XMbEqzb+01V6aSgh2A09nNjZPMx/Hf0KH4JkbJ1 TGXnv6mn5VBOw4VJrN2eNTi0VPy6h3E/BXDuoeSBbOFf5GU/Te/ZGLN2YDiXWw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=aOMzoR87; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Spam-Score: -1.42 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=aOMzoR87; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of bug-guix-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=bug-guix-bounces@gnu.org X-Migadu-Queue-Id: 3E5BFEEDD X-Spam-Score: -1.42 X-Migadu-Scanner: scn0.migadu.com X-TUID: jtH66J/btAMg Bleah, forgot to *completely* amend the commit that was using the release c= andidate... >From 14446422d6f7873b29d2fe04a9528de867b854b8 Mon Sep 17 00:00:00 2001 From: raid5atemyhomework 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=3D" 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/compatibili= ty.d\"\n")) + ;; Also update the manual, which uses absolute paths, so th= at + ;; /usr/share/zfs/compatibility.d/ is referred via the stor= e. + (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