From patchwork Mon Apr 29 08:22:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: antlers X-Patchwork-Id: 63666 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 4C0D927BBEA; Mon, 29 Apr 2024 09:27:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3DD3427BBE2 for ; Mon, 29 Apr 2024 09:27:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s1MLf-0004PG-P9; Mon, 29 Apr 2024 04:26:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1MLS-0004Og-Rc for guix-patches@gnu.org; Mon, 29 Apr 2024 04:26:46 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s1MLS-0001Lq-Cx for guix-patches@gnu.org; Mon, 29 Apr 2024 04:26:42 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s1MLl-0004eF-Uu for guix-patches@gnu.org; Mon, 29 Apr 2024 04:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70642] [PATCH v0] gnu: zfs: Update to 2.2.3 Resent-From: antlers Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Apr 2024 08:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70642 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70642@debbugs.gnu.org Cc: antlers X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.171437921617858 (code B ref -1); Mon, 29 Apr 2024 08:27:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Apr 2024 08:26:56 +0000 Received: from localhost ([127.0.0.1]:55829 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1MLf-0004dy-OR for submit@debbugs.gnu.org; Mon, 29 Apr 2024 04:26:56 -0400 Received: from lists.gnu.org ([2001:470:142::17]:59648) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s1MLd-0004ds-2l for submit@debbugs.gnu.org; Mon, 29 Apr 2024 04:26:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1MLB-0004MO-G1 for guix-patches@gnu.org; Mon, 29 Apr 2024 04:26:26 -0400 Received: from wfhigh4-smtp.messagingengine.com ([64.147.123.155]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s1ML8-0001KU-4P for guix-patches@gnu.org; Mon, 29 Apr 2024 04:26:24 -0400 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailfhigh.west.internal (Postfix) with ESMTP id 3D8A71800115; Mon, 29 Apr 2024 04:26:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Mon, 29 Apr 2024 04:26:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=illucid.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to; s=fm2; t=1714379177; x=1714465577; bh=dTkAy/ypK9Vwr5J8Vz0Sj svrZQCDneyoYkhkLjM/lhQ=; b=QG+DuxdUrzkxHV7EUCn5jnDrQthOlDI9eZaje eHpHWkLoATVFlZrRavR9aCR62FVq8D9xQxGJ+0ux/QqSxTqe4qkYQgK8nN85EeTy v9m5Zrec+1L8RGkiz3heW+f5G9SRtkRXIIA2cZBxwUWgdxijE6qoyINgHIFVZgCt 1zN3Oz50lD86n02gJTCwa2QqPpvaiiIp4gEsNccMA5YXamUP7+UJmrEvOk+mIbyR 8/y2bUEAIwW+2vFHB9i947XBVg1PXtfTF/De15TB1zaElkZ9aNtAEekF1eYHgPUv b4iKwRCPwKeEBj2oc9/MfcQ7D1VLvSiUqWQ0fdQVh/lIv1Z4g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:subject:subject:to :to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1714379177; x=1714465577; bh=dTkAy/ypK9Vwr5J8Vz0SjsvrZQCD neyoYkhkLjM/lhQ=; b=X4JC9iKq8MS4rVpEOeOruuA/v4u1Df9HadMq+hB68Qgk A3WzxOUSTsidCZWwUWX7AIEt3hCnaWyv4+UDgteiNQNkGIewzSSbubM1IprPmkqO /zHgyeTg+aLms22oepV08eqnNRKEUjmwyXZFD7dDB5o2n/vfRqColuBw/6APktMg WCbWdCPyvFB6WZv0VS45QjEl6yty3MvUaEhu7+G6Mj0TfZ2NNborjfsEOp2IwtY7 Ha51atdLJkTdlAODoWPcaIbkRTpHpTsFxnMp7iecnUropdyl30m414TXhzg97d+E ShEyLgJzKRwRUDr2rra5qbX7jH/mkNwvFJinCYqjog== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrvdduuddgtddvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpegrnhhtlhgvrhhsuceorghnthhlvghrshesihhllhhutghiugdr nhgvtheqnecuggftrfgrthhtvghrnhephfefkedthfegjedugefggfdvgeegueeilefhgf elgffhvedulefghfekteevgfejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghm pehmrghilhhfrhhomheprghnthhlvghrshesihhllhhutghiugdrnhgvth X-ME-Proxy: Feedback-ID: i7f19465a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 29 Apr 2024 04:26:17 -0400 (EDT) Date: Mon, 29 Apr 2024 01:22:36 -0700 Message-ID: <20240429082604.2329-1-antlers@illucid.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=64.147.123.155; envelope-from=antlers@illucid.net; helo=wfhigh4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, 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: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: antlers X-ACL-Warn: , antlers via Guix-patches X-Patchwork-Original-From: antlers via Guix-patches via From: antlers Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/file-systems.scm (zfs): Update to 2.2.3 --- I did the bare minimum to build v2.2.x after mounting my array elsewhere and inadvertently catching a dependance on feature 'com.klarasystems:vdev_zaps_v2'. Specifically, I removed substitutions on files which no longer exist and added new ones until it built. Hence I can make no claim that this is exaustive, but I can mount the array and nothing's broken that wasn't already (ie. ZED). I've made a habit of mentioning how to run this because it's not documented. You have to: a.) build it against your current kernel (<=v6.7, lts is currently 6.6) by setting the package's '#:linux' argument. b.) ensure that the module is loaded by either creating a 'kernel-module-loader' service or building the module into the kernel. A few additional notes-to-self: - Combining 'a' with the latter approach to 'b' means building the kernel twice, when (IIRC) 'linux-module-build-system' packages often depend on target sources rather than outputs? We should probably be able to set `#:linux` to (or infer from it) the headers or whatever's needed without depending on a full kernel build. - ZFS Event Daemon (ZED) fails to start because it thinks it lives in '/gnu/store/...-zfs-2.x.x/var/run', and I don't even see an option to override it from the command-line. Seems to have been like that for a while. Should be a quick fix by setting '@runstatedir@' correctly, but I doubt anyone's clamoring for it and am moving on for now -- could toss in a fix for that with the next point release? gnu/packages/file-systems.scm | 36 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 8afd853350..8e85b295cf 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -1442,7 +1442,7 @@ (define args (define-public zfs (package (name "zfs") - (version "2.1.14") + (version "2.2.3") (outputs '("out" "module" "src")) (source (origin @@ -1451,7 +1451,7 @@ (define-public zfs "/download/zfs-" version "/zfs-" version ".tar.gz")) (sha256 - (base32 "0gzansmin40llxxh2zkgpdyp41ikd8s5hv5mpwhpcivk1q8fv7sh")))) + (base32 "1hqsv2skymrhzg9n94bcna8r7m1zl30wjb5knaw43j659vri599h")))) (build-system linux-module-build-system) (arguments (list @@ -1500,12 +1500,6 @@ (define-public zfs "man/man7/zpool-features.7") (("/usr/share/zfs/compatibility.d") (string-append #$output "/share/zfs/compatibility.d"))) - (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. @@ -1516,9 +1510,17 @@ (define-public zfs ;; 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* "configure" + (("/etc/default") + (string-append #$output "/etc/default")) + (("/etc/bash_completion.d") + (string-append #$output "/etc/bash_completion.d"))) + (substitute* "Makefile.in" + (("/usr/share/initramfs-tools") + (string-append #$output "/usr/share/initramfs-tools"))) + (substitute* "contrib/initramfs/Makefile.am" + (("/usr/share/initramfs-tools") + (string-append #$output "/usr/share/initramfs-tools"))) (substitute* "module/os/linux/zfs/zfs_ctldir.c" (("/usr/bin/env\", \"umount") (string-append (search-input-file inputs "/bin/umount") @@ -1535,18 +1537,8 @@ (define-public zfs (substitute* "config/zfs-build.m4" (("\\$sysconfdir/init.d") (string-append #$output "/etc/init.d"))) - (substitute* '("etc/zfs/Makefile.am" - "cmd/zed/Makefile.am") + (substitute* '("cmd/zed/Makefile.am") (("\\$\\(sysconfdir)") (string-append #$output "/etc"))) - (substitute* "cmd/vdev_id/vdev_id" - (("PATH=/bin:/sbin:/usr/bin:/usr/sbin") - (string-append "PATH=" - (dirname (which "chmod")) ":" - (dirname (which "grep")) ":" - (dirname (which "sed")) ":" - (dirname (which "gawk"))))) - (substitute* "contrib/pyzfs/Makefile.in" - ((".*install-lib.*") "")) (substitute* '("Makefile.am" "Makefile.in") (("\\$\\(prefix)/src") (string-append #$output:src "/src"))) (substitute* (find-files "udev/rules.d/" ".rules.in$")