From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id IIA3LS3WQWZssAAAe85BDQ:P1 (envelope-from ) for ; Mon, 13 May 2024 10:58:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id IIA3LS3WQWZssAAAe85BDQ (envelope-from ) for ; Mon, 13 May 2024 10:58:21 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1715590701; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-to: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; bh=5TIB2arzqeak3+C11o4krrxt7P4cXKxotnGgkcLMhqI=; b=Z3QCTd+30r86vcFxvtIdYvi3TymO1GRwniIV9yq0XFTD5ABv7UHsQfJNqfDcxK+nCNqqzg RGtiGMgQsMaLonvAtDUzzm83O/RuOPdJJX2uQP8jR9R6NqvLOGeWat6ARTqqBlK8BSKMQ1 B8FmMP0OSEdYVyoHPvcCzsPUn+4jPZUAcc7nszHKZLZaddgwqpKocMbV4Rjt4WVhocqM91 rcj3C14nUDQuryyziRY7rT9z6KXRMMBsabv1ROvXTZ4bZ3UjKMNHJzxkpqQY6S1CCC1c1e H0PZ8wbA93xZRj1IIHIBR2no+K3YZAGAdlC9boymiP59XAqDKZx26wemZkmWvw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1715590701; a=rsa-sha256; cv=none; b=eeiPHQHdNLd554vkl9yv4rNWtvfmjIzyBRltp8rwh0qUifDRGp7ep+RIttDsot+NlOrvFn KI5k2LT+8KyGimFBhsJtMkGD/eqqocZFIRniPWjhJclolM4ladDz3919djOF3ngYD8el5i FEZedhDOqdTr1j1/2RhpTmawI617nukBQ03gXTanVNLttV2cznYSdC+TbYBRe6P9RRnkwC dCRiZY9KgzhHGZPrD9r+M+MHkBW1U3hnvg2qYK2cJpJkp/yuKl21rwg+I0IzMJLEOwWh9m lHuoScCxYTjMGC4GRfLugy9upee+jjWcWeWfrb3Jby3EMJYU4WSGwrsRRLMUVQ== 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 86B7A99CA for ; Mon, 13 May 2024 10:58:21 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6RVU-00065Y-EI; Mon, 13 May 2024 04:58:04 -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 1s6RVS-000658-8a for guix-patches@gnu.org; Mon, 13 May 2024 04:58:02 -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 1s6RVS-0008HV-0X for guix-patches@gnu.org; Mon, 13 May 2024 04:58:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1s6RVR-0004dm-UT for guix-patches@gnu.org; Mon, 13 May 2024 04:58:01 -0400 Subject: bug#70642: [PATCH v0] gnu: zfs: Update to 2.2.3 Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Mon, 13 May 2024 08:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 70642 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: antlers Cc: 70642-done@debbugs.gnu.org Mail-Followup-To: 70642@debbugs.gnu.org, mail@cbaines.net, antlers@illucid.net Received: via spool by 70642-done@debbugs.gnu.org id=D70642.171559066717827 (code D ref 70642); Mon, 13 May 2024 08:58:01 +0000 Received: (at 70642-done) by debbugs.gnu.org; 13 May 2024 08:57:47 +0000 Received: from localhost ([127.0.0.1]:59636 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6RVD-0004dT-0k for submit@debbugs.gnu.org; Mon, 13 May 2024 04:57:47 -0400 Received: from mira.cbaines.net ([212.71.252.8]:43484) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s6RV9-0004dN-Ap for 70642-done@debbugs.gnu.org; Mon, 13 May 2024 04:57:45 -0400 Received: from localhost (unknown [45.67.83.168]) by mira.cbaines.net (Postfix) with ESMTPSA id A028627BBE2; Mon, 13 May 2024 09:57:11 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id a8d56584; Mon, 13 May 2024 08:57:10 +0000 (UTC) From: Christopher Baines In-Reply-To: <20240429082604.2329-1-antlers@illucid.net> (antlers via Guix-patches via's message of "Mon, 29 Apr 2024 01:22:36 -0700") References: <20240429082604.2329-1-antlers@illucid.net> User-Agent: mu4e 1.12.2; emacs 29.3 Date: Mon, 13 May 2024 09:57:08 +0100 Message-ID: <87ttj23x97.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -6.97 X-Migadu-Queue-Id: 86B7A99CA X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.97 X-TUID: 3t75DiR4toRY --=-=-= Content-Type: text/plain antlers via Guix-patches via writes: > gnu/packages/file-systems.scm | 36 ++++++++++++++--------------------- > 1 file changed, 14 insertions(+), 22 deletions(-) > ... > @@ -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"))) You had a bunch of tabs here which guix lint should tell you about. > (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" I've restored this substitute* and just corrected the file location. > - (("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$") Thanks for the patch, I've made the tweaks above and pushed this to master as 0309080ffcb1d6a124f672275316a76bcda2e211. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZB1eRfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xckug/7BReraYFm3Di/QBBGQZiQ5Z+Ivd/3oCQx PI8LCckyeFn7LJqrt4daIwTtdS91nVReZjPsCjuMXuDL06zh07fVJ+YjNghcYlCh RDBvpzj4CHJ07Lhs12d9W6Psk/YO1jjR6KS260BH/SKBvVG30jG3+wiFwls/iTkj K6kEPC3184hAL0Puqs1qsFVsgDKwT7aNdBtN2a0iWw1AuQXIbReKu3CNpNnegwlG tNttZsnCxIZKB2Wzauu2Vm8SOvpt58xw6N/pPO/EtLQkvBXo/yoht6kBmYbCZByo kYZ2f9rZx7/VUkuXUB9fBSUaJSrs8FtPtoaoX/SKFgACkjTa33GvutYuvQ539TuZ zSFsvFsMFMYVPoDesFgpY8Uq0FVKI1VhY6vd11zNJQtpRFIl/+1qNxRseQu4TMMi 20/5f4qNV36uxDRd40yfkNgUd1iI+ynzfGsjIaC/Rt/AkYB77zEFq4wV0L4ToJbG wl+bxfMKTzlEjbMk0zo+fdTfxXsIl8Oh+x+Vt/7aY7GNzNbNwlYdEG8WAeRMXft8 +chkqx7+htXlkvFDAXMHAlpqgiEkpn/biEa9Th1MYYQNF85I0ADy6GobxUJ5Qk8X EKt0DUoc9eeUOzBHc5yoo4PcOEXbf5G22SzuajQqbPFrTE9rrmLEgIOWZTHWDtzY m2M26LoYH8U= =Wjyb -----END PGP SIGNATURE----- --=-=-=--