From patchwork Thu Dec 24 10:59:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: raid5atemyhomework X-Patchwork-Id: 25923 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 ED08E27BC06; Thu, 24 Dec 2020 11:22:03 +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 A12DD27BC05 for ; Thu, 24 Dec 2020 11:22:03 +0000 (GMT) Received: from localhost ([::1]:53486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ksOh0-0001hY-LM for patchwork@mira.cbaines.net; Thu, 24 Dec 2020 06:22:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56434) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ksOMg-0005Ll-It for guix-patches@gnu.org; Thu, 24 Dec 2020 06:01:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ksOMg-0006GV-8h for guix-patches@gnu.org; Thu, 24 Dec 2020 06:01:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ksOMg-0000Fj-4F for guix-patches@gnu.org; Thu, 24 Dec 2020 06:01:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45403] [PATCH] gnu: zfs: Split into packages specific for each of our major supported kernel versions. Resent-From: raid5atemyhomework Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Dec 2020 11:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 45403 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45403@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.1608807616906 (code B ref -1); Thu, 24 Dec 2020 11:01:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Dec 2020 11:00:16 +0000 Received: from localhost ([127.0.0.1]:54819 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ksOLv-0000EY-JK for submit@debbugs.gnu.org; Thu, 24 Dec 2020 06:00:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:40982) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ksOLq-0000EM-TN for submit@debbugs.gnu.org; Thu, 24 Dec 2020 06:00:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56216) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ksOLp-0005Ez-7k for guix-patches@gnu.org; Thu, 24 Dec 2020 06:00:10 -0500 Received: from mail-40130.protonmail.ch ([185.70.40.130]:21481) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ksOLk-0005sn-84 for guix-patches@gnu.org; Thu, 24 Dec 2020 06:00:08 -0500 Date: Thu, 24 Dec 2020 10:59:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608807600; bh=NpvB8nWrO3dSKXlkH3XrW2CTxkoi7X+JxvS5EtmbRe4=; h=Date:To:From:Reply-To:Subject:From; b=j6yjV2oh77xK+rQadGZlVlFLcU2auR5L8xWyXEIPKDiWo/sruJHCnSCf3+Akz9WUT 1M1i/ZbRT6Cyxm88h2MFFbEpjOFUac8G3YJYRamTmsm7ep8ygb277qvr7k/TqpVkkR ebtWrW3xYoa5+E5oVzdFwoPizh63L5KQ58yI/r8c= Message-ID: MIME-Version: 1.0 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_H2=-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-Mailman-Approved-At: Thu, 24 Dec 2020 06:21:54 -0500 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 Fixes: https://issues.guix.gnu.org/45401 Untested --- no idea how to repoint my guix to a temporary commit on my local file repo, would appreciate any guidance. From 242ee858b057f1c3ca4a80c9c449f710c5b1ff96 Mon Sep 17 00:00:00 2001 From: raid5atemyhomework Date: Thu, 24 Dec 2020 10:54:17 +0000 Subject: [PATCH] gnu: zfs: Split into packages specific for each of our major supported kernel versions. --- gnu/packages/file-systems.scm | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) -- 2.29.2 diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index af587f73fe..d3cdeda4fb 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -843,7 +843,7 @@ APFS.") (home-page "https://github.com/sgan81/apfs-fuse") (license license:gpl2+)))) -(define-public zfs +(define zfs-base (package (name "zfs") (version "0.8.5") @@ -954,6 +954,35 @@ originally developed for Solaris and is now maintained by the OpenZFS community.") (license license:cddl1.0))) +(define-public zfs + (package + (inherit zfs-base) + (description + (string-append (package-description zfs-base) + " + +This package is deprecated, use linux-VERSION-zfs packages instead.")))) + +(define (make-linux-zfs linux-libre) + (package + (inherit zfs-base) + (arguments + `(#:linux ,linux-libre) + ,@(package-arguments zfs-base)) + (description + (string-append (package-description zfs-base) + " + +This package will be compiled to work with the linux-libre " + (package-version linux-libre) + " kernel.")))) + +(define-public linux-5.9-zfs (make-linux-zfs linux-libre-5.9)) +(define-public linux-5.4-zfs (make-linux-zfs linux-libre-5.4)) +(define-public linux-4.19-zfs (make-linux-zfs linux-libre-4.19)) +(define-public linux-4.14-zfs (make-linux-zfs linux-libre-4.14)) +(define-public linux-4.4-zfs (make-linux-zfs linux-libre-4.4)) + (define-public mergerfs (package (name "mergerfs")