From patchwork Sun Sep 22 19:52:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kaelyn Takata X-Patchwork-Id: 31347 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 AF5DC27BBEA; Sun, 22 Sep 2024 20:53:08 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS 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 2E32527BBE2 for ; Sun, 22 Sep 2024 20:53:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssSdP-0004xQ-Rs; Sun, 22 Sep 2024 15:52:44 -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 1ssSdO-0004t4-E0 for guix-patches@gnu.org; Sun, 22 Sep 2024 15:52:42 -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 1ssSdO-0002dX-4O for guix-patches@gnu.org; Sun, 22 Sep 2024 15:52:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:From:Date:To:In-Reply-To:References:Subject; bh=C+BdiNdX1t9NygovyzDDxBz6mu5+ZXtPDbBAhfFWQM0=; b=nOY1i78xogiVT4kTPAOOWY1VQQSgxpMpWMV7TogU4ifMsmhIsrDwwzlfebiHDfiUOPRDvuUOk5h28X+vsalUTbpkl7AxwuJzOwIBrsVCiy0aDw716W/b4eedRPI9qjW+rWyj29jP9K36kXSywX6q7O4Z2sfOSBnhzg1h9Th1eBMaE/cDpq9pw6bDVxSdVPZlVbX/V6IpoMc9tf6UufU2DAMBPev1F1ZFPddZSDdl+T8ITBOtv8HNkeVbozP45QydS6BSris92RTjAlWWvKQh+Db2VNBVcvEFIwau/UN8O5pi2Q7xC4Tco5f3BiBJgFJ+flZ+RnPaMb8Xmb9PQG0U5w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ssSdi-0006tQ-1H for guix-patches@gnu.org; Sun, 22 Sep 2024 15:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71482] [PATCH v2] gnu: zfs: Split the kernel module out of the base package. References: <8681cce4ff0cb548ff8bd527a77a5206c6d63e24.1718037851.git.kaelyn.alexi@protonmail.com> In-Reply-To: <8681cce4ff0cb548ff8bd527a77a5206c6d63e24.1718037851.git.kaelyn.alexi@protonmail.com> Resent-From: Kaelyn Takata Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Sep 2024 19:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71482 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71482@debbugs.gnu.org Cc: Kaelyn Takata Received: via spool by 71482-submit@debbugs.gnu.org id=B71482.172703476226457 (code B ref 71482); Sun, 22 Sep 2024 19:53:01 +0000 Received: (at 71482) by debbugs.gnu.org; 22 Sep 2024 19:52:42 +0000 Received: from localhost ([127.0.0.1]:42793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssSdN-0006sb-GL for submit@debbugs.gnu.org; Sun, 22 Sep 2024 15:52:42 -0400 Received: from mail-40133.protonmail.ch ([185.70.40.133]:31109) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ssSdI-0006sB-3a for 71482@debbugs.gnu.org; Sun, 22 Sep 2024 15:52:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1727034726; x=1727293926; bh=C+BdiNdX1t9NygovyzDDxBz6mu5+ZXtPDbBAhfFWQM0=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=io7p4ZwDVZCsXDSNM2lQchfCNFCd6mA8HpGmJSHXI+GfcnQXhgDcSye5C2rQk33G5 lD0sgd6Qw+geV3uUH4W2BJVCD8r72TYGJuBMRabySbjfCMZZfRs8nqRNOkcl6YJQsq vb9cmmOzRc2lE7C5/bQxgyHgQhQDBWf0QmcWlOnQwmpw35BlLckBn9q9G22Ww2JAwH Rv8ZnEBTAd2eqrWNrDXxiuOEciTVUyl6yklDrvgf2vLegUBlNR7XBp58aFUHWqrTgK NGUrX74VxYNyEineOBPHyIJYYY9Yz/et2vn0r+7sZskf7e0MFqGYvbFKOQmiKb0D/A srnLkYabcgtfw== Date: Sun, 22 Sep 2024 19:52:02 +0000 Message-ID: Feedback-ID: 34709329:user:proton X-Pm-Message-ID: f45563588ef5a2173f7f4f0c5352727466a56d3e 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: , Reply-to: Kaelyn Takata X-ACL-Warn: , Kaelyn Takata via Guix-patches X-Patchwork-Original-From: Kaelyn Takata via Guix-patches via From: Kaelyn Takata 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 Split the ZFS user-space tools and kernel modules into separate packages, with a new make-zfs-for-kernel procedure for easily creating ZFS kernel module packages for a specific kernel package. The generated kernel module package includes the kernel version for which it was built in the name of the package, such as "zfs-for-linux-libre-6.6.32-version". & gnu/packages/file-systems.scm (zfs): Change to be the user-space tools. (make-zfs-for-kernel): New procedure which accepts a single 'kernel-package' argument. Change-Id: Ib2d0e2b0f031d2ab3105d6b46ecd73bde1aa8564 --- gnu/packages/file-systems.scm | 126 ++++++++++++++++++++-------------- 1 file changed, 73 insertions(+), 53 deletions(-) base-commit: b7c94d528875415ea7ec6225d88a6b3d55fa2e14 diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 059bdf67a9..ceaaf7f3ab 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2021 raid5atemyhomework ;;; Copyright © 2021 Stefan Reichör ;;; Copyright © 2021 Noisytoot -;;; Copyright © 2021, 2023 Kaelyn Takata +;;; Copyright © 2021, 2023, 2024 Kaelyn Takata ;;; Copyright © 2022 Brian Cully ;;; Copyright © 2023 Aaron Covrig ;;; Copyright © 2024 Ahmad Draidi @@ -1564,7 +1564,6 @@ (define-public zfs (package (name "zfs") (version "2.2.6") - (outputs '("out" "module" "src")) (source (origin (method url-fetch) @@ -1573,33 +1572,19 @@ (define-public zfs "/zfs-" version ".tar.gz")) (sha256 (base32 "19x2a8k25i3y6nr7nx5aaqrpnp55vjmrw86p06zpgpf578804bn9")))) - (build-system linux-module-build-system) + (build-system gnu-build-system) (arguments (list - ;; The ZFS kernel module should not be downloaded since the license - ;; terms don't allow for distributing it, only building it locally. - #:substitutable? #f - ;; Tests cannot run in an unprivileged build environment. - #:tests? #f + #:configure-flags #~(list "--with-config=user" + (string-append "--prefix=" #$output) + (string-append "--with-dracutdir=" #$output + "/lib/dracut") + (string-append "--with-udevdir=" #$output + "/lib/udev") + (string-append "--with-mounthelperdir=" #$output + "/sbin")) #:phases #~(modify-phases %standard-phases - (add-after 'configure 'really-configure - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "configure" - (("-/bin/sh") (string-append "-" (which "sh")))) - (invoke "./configure" - "--with-config=all" - (string-append "--prefix=" #$output) - (string-append "--with-dracutdir=" #$output - "/lib/dracut") - (string-append "--with-udevdir=" #$output - "/lib/udev") - (string-append "--with-mounthelperdir=" #$output - "/sbin") - (string-append "--with-linux=" - (search-input-directory - inputs - "lib/modules/build"))))) (add-after 'unpack 'patch-source (lambda* (#:key inputs #:allow-other-keys) ;; New feature "compatibility=" in 2.1.0. @@ -1631,14 +1616,6 @@ (define-public zfs ;; Just use 'modprobe' in message to user, since Guix ;; does not have a traditional /sbin/ (("'/sbin/modprobe ") "'modprobe ")) - (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"))) @@ -1668,31 +1645,22 @@ (define-public zfs (dirname (which "sed")) ":" (dirname (which "gawk"))))) (substitute* '("Makefile.am" "Makefile.in") - (("\\$\\(prefix)/src") (string-append #$output:src "/src"))) + (("@initconfdir@") (string-append #$output "/etc/default")) + (("/usr/share/initramfs-tools" dir) (string-append #$output dir))) (substitute* (find-files "udev/rules.d/" ".rules.in$") (("/sbin/modprobe") (search-input-file inputs "/bin/modprobe"))))) - (replace 'build - (lambda _ (invoke "make"))) (replace 'install - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let* ((kmod (assoc-ref (or native-inputs inputs) "kmod"))) - (invoke "make" "install" - (string-append "DEFAULT_INITCONF_DIR=" - #$output "/etc/default") - (string-append "DEPMOD=" - (search-input-file - (or native-inputs inputs) - "/bin/depmod")) - (string-append "INSTALL_PATH=" #$output) - (string-append "INSTALL_MOD_PATH=" #$output:module) - "INSTALL_MOD_STRIP=1") - (install-file - "contrib/bash_completion.d/zfs" - (string-append #$output - "/share/bash-completion/completions")))))))) + (lambda _ + (invoke "make" "install" + (string-append "DEFAULT_INITCONF_DIR=" + #$output "/etc/default") + (string-append "INSTALL_PATH=" #$output) + (string-append "bashcompletiondir=" + #$output + "/share/bash-completion/completions"))))))) (native-inputs - (list attr kmod pkg-config)) + (list attr kmod pkg-config python)) (inputs (list eudev kmod libaio @@ -1712,6 +1680,58 @@ (define-public zfs community.") (license license:cddl1.0))) +(define-public (make-zfs-for-kernel kernel-package) + (package + (inherit zfs) + (name (string-join (list (package-name zfs) + "for" + (package-name kernel-package) + (package-version kernel-package) + "version") + "-")) + (build-system linux-module-build-system) + (arguments + (substitute-keyword-arguments + (strip-keyword-arguments '(#:configure-flags) + (package-arguments zfs)) + ((#:linux _ #f) kernel-package) + ((#:substitutable? _ #t) #f) + ((#:phases phases) + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-source + (assoc-ref #$phases 'patch-source)) + (add-after 'configure 'really-configure + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "configure" + (("-/bin/sh") (string-append "-" (which "sh")))) + (invoke "./configure" + "--with-config=kernel" + (string-append "--prefix=" #$output) + (string-append "--with-udevdir=" #$output + "/lib/udev") + (string-append "--with-linux=" + (search-input-directory + inputs + "lib/modules/build"))))) + (replace 'build + (lambda* (#:key (make-flags '()) (parallel-build? #t) + #:allow-other-keys) + (apply invoke "make" + `(,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '()) + ,@make-flags)))) + (replace 'install + (lambda* (#:key inputs native-inputs #:allow-other-keys) + (let* ((kmod (assoc-ref (or native-inputs inputs) "kmod"))) + (invoke "make" "-C" "module" "install" + (string-append "DEPMOD=" + (search-input-file + (or native-inputs inputs) + "/bin/depmod")) + (string-append "INSTALL_MOD_PATH=" #$output) + "INSTALL_MOD_STRIP=1")))))))))) + (define-public zfs-auto-snapshot (package (name "zfs-auto-snapshot")