From patchwork Wed May 10 16:39:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Denis 'GNUtoo' Carikli X-Patchwork-Id: 49914 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 308F327BBEE; Wed, 10 May 2023 17:40:58 +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=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 3AB4C27BBED for ; Wed, 10 May 2023 17:40:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwmrG-0006Ym-1J; Wed, 10 May 2023 12:40:06 -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 1pwmrC-0006Xz-Rr for guix-patches@gnu.org; Wed, 10 May 2023 12:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwmrC-0005w0-FY for guix-patches@gnu.org; Wed, 10 May 2023 12:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwmrC-0003P5-B3 for guix-patches@gnu.org; Wed, 10 May 2023 12:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63420] [PATCH v1 1/4] gnu: btrfs-progs: Run 'guix style' over the package. References: <20230510163446.2635-1-GNUtoo@cyberdimension.org> In-Reply-To: <20230510163446.2635-1-GNUtoo@cyberdimension.org> Resent-From: Denis 'GNUtoo' Carikli Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2023 16:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63420 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari , Tobias Geerinckx-Rice , 63420@debbugs.gnu.org Cc: Denis 'GNUtoo' Carikli Received: via spool by 63420-submit@debbugs.gnu.org id=B63420.168373677113006 (code B ref 63420); Wed, 10 May 2023 16:40:02 +0000 Received: (at 63420) by debbugs.gnu.org; 10 May 2023 16:39:31 +0000 Received: from localhost ([127.0.0.1]:48849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqh-0003Nc-4D for submit@debbugs.gnu.org; Wed, 10 May 2023 12:39:31 -0400 Received: from cyberdimension.org ([80.67.179.20]:49868 helo=gnutoo.cyberdimension.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwmqe-0003NM-Vu for 63420@debbugs.gnu.org; Wed, 10 May 2023 12:39:29 -0400 Received: from gnutoo.cyberdimension.org (localhost [127.0.0.1]) by cyberdimension.org (OpenSMTPD) with ESMTP id f47cc4f2; Wed, 10 May 2023 16:39:27 +0000 (UTC) Received: from localhost.localdomain (localhost [::1]) by gnutoo.cyberdimension.org (OpenSMTPD) with ESMTP id db663285; Wed, 10 May 2023 16:39:27 +0000 (UTC) From: Denis 'GNUtoo' Carikli Date: Wed, 10 May 2023 18:39:22 +0200 Message-Id: <20230510163925.3071-1-GNUtoo@cyberdimension.org> X-Mailer: git-send-email 2.39.2 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Signed-off-by: Denis 'GNUtoo' Carikli --- gnu/packages/linux.scm | 60 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ea64e9d241..c2449f0b45 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -66,7 +66,7 @@ ;;; Copyright © 2022 Artyom V. Poptsov ;;; Copyright © 2022 Rene Saavedra ;;; Copyright © 2022 muradm -;;; Copyright © 2022 Denis 'GNUtoo' Carikli +;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Hunter Jozwiak ;;; Copyright © 2022 Hilton Chain ;;; Copyright © 2022 Stefan @@ -5884,14 +5884,13 @@ (define-public btrfs-progs (source (origin (method url-fetch) (uri (string-append "mirror://kernel.org/linux/kernel/" - "people/kdave/btrfs-progs/" - "btrfs-progs-v" version ".tar.xz")) + "people/kdave/btrfs-progs/" "btrfs-progs-v" + version ".tar.xz")) (sha256 (base32 "0ylxszcsm0jqsa5glccd1pv3rcfk1f5wjcf3ayxc0r9xgzcngrkb")))) (build-system gnu-build-system) - (outputs '("out" - "static")) ; static versions of the binaries in "out" + (outputs '("out" "static")) ;static versions of the binaries in "out" (arguments '(#:configure-flags ;; The ‘Python support’ was never actually installed by previous @@ -5904,29 +5903,33 @@ (define-public btrfs-progs (("\\$\\(DESTDIR\\)\\$\\(udevruledir\\)") (string-append (assoc-ref outputs "out") "/lib/udev/rules.d"))))) - (add-after 'build 'build-static - (lambda _ (invoke "make" "static"))) - (add-after 'install 'install-bash-completion - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bashcomp (string-append out "/etc/bash_completion.d"))) - (mkdir-p bashcomp) - (copy-file "btrfs-completion" - (string-append bashcomp "/btrfs"))))) - (add-after 'install 'install-static - (let ((staticbin (string-append (assoc-ref %outputs "static") - "/bin"))) - (lambda _ - (invoke "make" - (string-append "bindir=" staticbin) - "install-static"))))) - #:tests? #f ; XXX: require the 'btrfs' kernel module. + (add-after 'build 'build-static + (lambda _ + (invoke "make" "static"))) + (add-after 'install 'install-bash-completion + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bashcomp (string-append out + "/etc/bash_completion.d"))) + (mkdir-p bashcomp) + (copy-file "btrfs-completion" + (string-append bashcomp "/btrfs"))))) + (add-after 'install 'install-static + (let ((staticbin (string-append (assoc-ref %outputs + "static") + "/bin"))) + (lambda _ + (invoke "make" + (string-append "bindir=" staticbin) + "install-static"))))) + #:tests? #f ;XXX: require the 'btrfs' kernel module. #:test-target "test" - #:parallel-tests? #f)) ; tests fail when run in parallel - (inputs `(("e2fsprogs" ,e2fsprogs) ; for btrfs-convert + #:parallel-tests? #f)) ;tests fail when run in parallel + (inputs `(("e2fsprogs" ,e2fsprogs) + ;for btrfs-convert ("eudev" ,eudev) ("lzo" ,lzo) - ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid + ("util-linux:lib" ,util-linux "lib") ;for libblkid and libuuid ("util-linux:static" ,util-linux "static") ;ditto ("zlib" ,zlib) ("zlib:static" ,zlib "static") @@ -5938,14 +5941,15 @@ (define-public btrfs-progs ;; For tests. ("acl" ,acl) ("dmsetup" ,lvm2) - ("grep" ,grep) ; need Perl regexp support + ("grep" ,grep) ;need Perl regexp support ("libaio" ,libaio) ("liburing" ,liburing) - ("util-linux" ,util-linux) ; for fallocate + ("util-linux" ,util-linux) ;for fallocate ("which" ,which))) (home-page "https://btrfs.wiki.kernel.org/index.php/Main_Page") (synopsis "Create and manage btrfs copy-on-write file systems") - (description "Btrfs is a @acronym{CoW, copy-on-write} file system for Linux + (description + "Btrfs is a @acronym{CoW, copy-on-write} file system for Linux aimed at implementing advanced features while focusing on fault tolerance, repair and easy administration.") ;; GPL2+: crc32.c, radix-tree.c, raid6.c, rbtree.c.