From patchwork Sun Jan 10 09:58:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: raid5atemyhomework X-Patchwork-Id: 26296 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F419E27BC19; Sun, 10 Jan 2021 09:59:09 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 73DAE27BC0E for ; Sun, 10 Jan 2021 09:59:09 +0000 (GMT) Received: from localhost ([::1]:50252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kyXV6-0008My-IW for patchwork@mira.cbaines.net; Sun, 10 Jan 2021 04:59:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57084) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kyXV0-0008Mc-Qy for guix-patches@gnu.org; Sun, 10 Jan 2021 04:59:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41573) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kyXV0-0003be-K9 for guix-patches@gnu.org; Sun, 10 Jan 2021 04:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kyXV0-0002tY-IF for guix-patches@gnu.org; Sun, 10 Jan 2021 04:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45734] [PATCH v2] gnu: update zfs. References: In-Reply-To: Resent-From: raid5atemyhomework Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Jan 2021 09:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45734 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "45734@debbugs.gnu.org" <45734@debbugs.gnu.org> Received: via spool by 45734-submit@debbugs.gnu.org id=B45734.161027269911069 (code B ref 45734); Sun, 10 Jan 2021 09:59:02 +0000 Received: (at 45734) by debbugs.gnu.org; 10 Jan 2021 09:58:19 +0000 Received: from localhost ([127.0.0.1]:53119 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyXUJ-0002sT-1v for submit@debbugs.gnu.org; Sun, 10 Jan 2021 04:58:19 -0500 Received: from mail-40130.protonmail.ch ([185.70.40.130]:59003) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kyXUH-0002sE-9E for 45734@debbugs.gnu.org; Sun, 10 Jan 2021 04:58:18 -0500 Date: Sun, 10 Jan 2021 09:58:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1610272690; bh=uVdoRXzGUSmoI0ej/ubaaVo0o5as8LrtVMVf7HVkG7g=; h=Date:To:From:Reply-To:Subject:From; b=T8M+5URgOpeVDbu7EEtJafhjzFZUb4pQ1dRmNfeLJYPgH0feuhjAxK5k7YZ5aEISp FJQ1qpV87yf/a6Ns/yk4Mc0nwSstqacr5gntx9EKHZcrDMB1i0lGKFVuCe5cajZ7VS VrQ1kjiV8olHJvsRSpsEaEPclT8gf4om51xgmkuI= Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: raid5atemyhomework , raid5atemyhomework via Guix-patches X-Patchwork-Original-From: raid5atemyhomework via Guix-patches via From: raid5atemyhomework X-getmail-retrieved-from-mailbox: Patches This patch instead updates to 2.0.1. The upstream changes that most affect the transition from 0.8.x to 2.0.x are: * FreeBSD and Linux have merged codebases, hence the reason why some files now have an extra `/os/linux` directory. * Files installed in `/etc/default/` now use simpler installation that supposedly works on both Linux and FreeBSD, but seems not to work in Guix specifically, for reasons I haven't explored. I just disabled its installation instead. * The Linux build of the userland tools will now attempt to load the ZFS module, but this uses `/sbin/modprobe` which does not exist in Guix; I substitute this as well. This new version of the patch, however, requires https://issues.guix.gnu.org/45723 I've checked that this works in a VM. I added patches from https://issues.guix.gnu.org/45692 https://issues.guix.gnu.org/45722 https://issues.guix.gnu.org/45723 in order to get a VM image with a ZFS 2.0.1. The OpenZFS project will end-of-life the ZFS 0.8.x series soon. The ZFS 0.8.x series was inherited from the ZFS on Linux project and that particular sequence of releases is Linux-specific. Since OpenZFS has merged the Linux and FreeBSD forks, they decided to use the later version numbering 2.0.x and will now maintain only a single Linux-or-FreeBSD codebase, so Guix also needs to follow suit if Guix intends to have ZFS support in the foreseeable future. From bad3a65ae19a5a3c74c700163138f6f17f3017de Mon Sep 17 00:00:00 2001 From: raid5atemyhomework Date: Sat, 9 Jan 2021 11:53:58 +0800 Subject: [PATCH] gnu: update zfs. * gnu/packages/file-systems.scm (zfs): Update version to 2.0.1. --- gnu/packages/file-systems.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) -- 2.30.0 diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index f74d519b33..49afe61e95 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -847,7 +847,7 @@ APFS.") (define-public zfs (package (name "zfs") - (version "0.8.5") + (version "2.0.1") (outputs '("out" "module" "src")) (source (origin @@ -856,7 +856,7 @@ APFS.") "/download/zfs-" version "/zfs-" version ".tar.gz")) (sha256 - (base32 "0gfdnynmsxbhi97q73smrgmcw1k8zmlr1hgljfn38sk0kimivd6v")))) + (base32 "0y3992l4nzr67q18lz1kizw0za1shvqbpmsjz9shv4frh5ihllbi")))) (build-system linux-module-build-system) (arguments `(;; The ZFS kernel module should not be downloaded since the license @@ -887,18 +887,31 @@ APFS.") (util-linux (assoc-ref inputs "util-linux")) (nfs-utils (assoc-ref inputs "nfs-utils")) (kmod (assoc-ref inputs "kmod-runtime"))) + (substitute* "etc/Makefile.in" + ;; This just contains an example configuration file for + ;; configuring ZFS on traditional init systems, skip it + ;; since we cannot use it anyway; the install target becomes + ;; misdirected. + (("= default ") "= ")) + (substitute* "lib/libzfs/os/linux/libzfs_util_os.c" + ;; Use path to /gnu/store/*-kmod in actual path that is exec'ed. + (("\"/sbin/modprobe\"") + (string-append "\"" kmod "/bin/modprobe" "\"")) + ;; Just use 'modprobe' in message to user, since Guix + ;; does not have a traditional /sbin/ + (("'/sbin/modprobe ") "'modprobe ")) (substitute* "contrib/Makefile.in" ;; This is not configurable nor is its hard-coded /usr prefix. ((" initramfs") "")) - (substitute* "module/zfs/zfs_ctldir.c" + (substitute* "module/os/linux/zfs/zfs_ctldir.c" (("/usr/bin/env\", \"umount") (string-append util-linux "/bin/umount\", \"-n")) (("/usr/bin/env\", \"mount") (string-append util-linux "/bin/mount\", \"-n"))) - (substitute* "lib/libzfs/libzfs_mount.c" + (substitute* "lib/libzfs/os/linux/libzfs_mount_os.c" (("/bin/mount") (string-append util-linux "/bin/mount")) (("/bin/umount") (string-append util-linux "/bin/umount"))) - (substitute* "lib/libshare/nfs.c" + (substitute* "lib/libshare/os/linux/nfs.c" (("/usr/sbin/exportfs") (string-append nfs-utils "/sbin/exportfs"))) (substitute* "config/zfs-build.m4"