From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id kJymCVzb+mDhAAAAgWs5BA (envelope-from ) for ; Fri, 23 Jul 2021 17:08:12 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id gFgxBVzb+mBiGwAAbx9fmQ (envelope-from ) for ; Fri, 23 Jul 2021 15:08: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 B374ECEF6 for ; Fri, 23 Jul 2021 17:08:11 +0200 (CEST) Received: from localhost ([::1]:52826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6wmY-00033t-Pj for larch@yhetil.org; Fri, 23 Jul 2021 11:08:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6wmQ-00031F-Bm for bug-guix@gnu.org; Fri, 23 Jul 2021 11:08:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:60986) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6wmQ-00063o-3S for bug-guix@gnu.org; Fri, 23 Jul 2021 11:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m6wmP-0003oM-VY for bug-guix@gnu.org; Fri, 23 Jul 2021 11:08:01 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#49710: [PATCH] gnu: Update OpenZFS to 2.1.0. Resent-From: raid5atemyhomework Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 23 Jul 2021 15:08:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49710 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch To: 49710@debbugs.gnu.org X-Debbugs-Original-To: "bug-guix@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.162705283914573 (code B ref -1); Fri, 23 Jul 2021 15:08:01 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jul 2021 15:07:19 +0000 Received: from localhost ([127.0.0.1]:44293 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6wli-0003my-Qx for submit@debbugs.gnu.org; Fri, 23 Jul 2021 11:07:19 -0400 Received: from lists.gnu.org ([209.51.188.17]:40262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6wlf-0003mo-Eo for submit@debbugs.gnu.org; Fri, 23 Jul 2021 11:07:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6wlf-0002xw-0d for bug-guix@gnu.org; Fri, 23 Jul 2021 11:07:15 -0400 Received: from mail-40130.protonmail.ch ([185.70.40.130]:38836) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6wlc-0005W5-I5 for bug-guix@gnu.org; Fri, 23 Jul 2021 11:07:14 -0400 Date: Fri, 23 Jul 2021 15:07:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1627052829; bh=M2pvjEAMtrM1i28GZ5sNgEG+W34lJlsJw623FgSsuF4=; h=Date:To:From:Reply-To:Subject:From; b=MVxlHKDm59waLWBanJtPCr+fAVGNGJHMvNoRMTzqvUbazzWa9hJu/aIJTTHc0R/+T 8DFmNnVWuQ95aS2n4bDD5nn+/elZnQ0qI5E7qwHmv7e9kZc2NY5PArljGl33NoHOGZ Kx8HOj3YZE2BSRbNdCDqjBANVOe4A6hjdT958NhU= Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=185.70.40.130; envelope-from=raid5atemyhomework@protonmail.com; helo=mail-40130.protonmail.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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=1627052891; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=M2pvjEAMtrM1i28GZ5sNgEG+W34lJlsJw623FgSsuF4=; b=i5LohTdWDXGbvf2UIxKpjxGFHDbL4cNOOTeLkKx5Tvn+VAf303YfZ0y3LQdkFK3gUWkYyt q/GDuI5t3h9ulLuwavfC4ezWx/cKAUynBl/gKuyUujKoPrSLm6mEtu8aQvXA4UvitE+qee Ad7nriu8mChDu7U8pJSH3nvMQjL5N9sFI3ujZ4oaawgU0fGR5wclphXzpM/bw/XD6P9trz 1Xec3u88SjsYItZe0DjQnJTZBiJeSzdar/+yYM+J04oHoY0sfUGIploQJfswQ5VFm/ytOz Vj6dmVbgMCs9S8j6bBII5gjjsWSJ6tx0FH8Alk64s56lseua1ZR35zL6EyWX7Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627052891; a=rsa-sha256; cv=none; b=f9XJUYAIF09Th6B8xUQGDKQywBj37CeNaKRgloTCwMuv/Ip1gmxRODw4KJmlaRd/OpTNog K47H8ew/ivwT2rYnoEB/6/bMwwjtdzsgFGjrn/kYdxevlA1EDPuyWLVzrmQrkonf4ULIM/ P+Ggob2yWGa0veMEVj8fIoR613w6IZLTO3YKjBTZJ5phsA+QVkzx/VsffZCvTOhoJB/08t gC89giVqcpe51HcRRg0wek3ZC/BkssNJGpDq93OYABoM4FHsAE7uxq8wkMsFcrmd3Q0qMk mBlGfFMapCIy14pVDRAF7ToglYsy5R+tSq3MdSVl6rXpduz9gcIW8QeR+6KVdw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=MVxlHKDm; 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: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=MVxlHKDm; 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: B374ECEF6 X-Spam-Score: -2.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: blFRmAZh1bTR >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/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