From patchwork Sun Sep 17 06:38:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 53973 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 026A427BBEA; Sun, 17 Sep 2023 07:40:23 +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 56B6727BBE2 for ; Sun, 17 Sep 2023 07:40:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhlRk-000336-L0; Sun, 17 Sep 2023 02:39:56 -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 1qhlRi-00032h-TB for guix-patches@gnu.org; Sun, 17 Sep 2023 02:39:54 -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 1qhlRi-0007o6-Lc for guix-patches@gnu.org; Sun, 17 Sep 2023 02:39:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhlRq-0006Q5-3A for guix-patches@gnu.org; Sun, 17 Sep 2023 02:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66043] [PATCH 1/2] gnu: bcachefs-tools: Update to 1.2. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 06:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66043@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 66043-submit@debbugs.gnu.org id=B66043.169493275324604 (code B ref 66043); Sun, 17 Sep 2023 06:40:02 +0000 Received: (at 66043) by debbugs.gnu.org; 17 Sep 2023 06:39:13 +0000 Received: from localhost ([127.0.0.1]:48917 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhlR3-0006Om-7v for submit@debbugs.gnu.org; Sun, 17 Sep 2023 02:39:13 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:51772) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhlR0-0006OP-AA for 66043@debbugs.gnu.org; Sun, 17 Sep 2023 02:39:12 -0400 Received: from localhost.localdomain (bba-86-99-176-46.alshamil.net.ae [86.99.176.46]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id CAEAB71D; Sun, 17 Sep 2023 06:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1694932735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C23FIy7eDhig6tRFFlW/lgHPzM7cJjex45Uoqnwxmj0=; b=ectH8JPzXCAWMPSv7gxa0C1aEIN+wJoS4qm65Ea68xsFa+D5ezXGRXepvVIyl3HsCUtvQw 7sF8HzRAh82xtseWCOLxDGIfAa6Hf5/kH4DFALsbdkVluqNMg3KhCbCsaGESYskWl1PiKx RDPMsq/w1Pnyu913OfsnU7cfjGjTt76hymFmrahQz79xVlJrLaY2cQoFnBJ9OYdwsGOw+p 4I7m5yS+POJB89KwzYtMbfujlUaaP1F5PiONwNS58WpY4521v+9FwHa4JIAgsX2vUeVKP+ 8JtFBy9YOBIwNW93NDlrrnBctmsl/VsdN4FPiCzsvxvJYjhd5SKEWZlVXQJK/6PT4Kpalc Wm1pfNv02u5UD0nbk6FPJvk0Z8t8OWyLdCgQWrs0EgQHjEGnb1SBby4p7Fb22/CPQAKmZS Z2xiX6YtP6jG7yRKfi56KfAX3Pnq2XLo/+45A5efqF8f6pKITUV3efZdsPfusow2tK8PSo 46Zb5XAV/TmxKT3tOpX4xD5Vv+fRUsMHYFQOO27Xs2Dn7w3eVqI3x1tgWs8+M1deE3WOKF D69WOyKeIOiGWkozl7MV3IasYP4+AWauUV9/iX8n4gC9vkGYqtzI4O/82Hab7j76eYdLNW AUhYdxxOc+TWYTXXOCEqcAwG2gZr7jFpl/6uJ8zTHQuj+3k6QWc1Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1694932735; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=C23FIy7eDhig6tRFFlW/lgHPzM7cJjex45Uoqnwxmj0=; b=LYNK5SwUpM2h9Qxb45YKS6x4+F0rVWRXJ+vVtkfi3rRXU6Y3KzvO+cAMiEPADbqGncm9g7 BiU75eC5GBTLWgAg== Date: Sun, 17 Sep 2023 10:38:00 +0400 Message-ID: <07551578b686f549623e635e87fe0b29301191d4.1694931512.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi 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 (bcachefs-tools): Update to 1.2. [source]: Use version instead of commit. --- gnu/packages/file-systems.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 0d98e23e93..efa26a199a 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -575,20 +575,18 @@ (define-public gphotofs (license license:gpl2+))) (define-public bcachefs-tools - (let ((commit "c8bec83e307f28751c433ba1d3f648429fb5a34c") - (revision "17")) (package (name "bcachefs-tools") - (version (git-version "0.1" revision commit)) + (version "1.2") (source (origin (method git-fetch) (uri (git-reference (url "https://evilpiepirate.org/git/bcachefs-tools.git") - (commit commit))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0b1avy5mw3r3ppfs3n9cq4zb74yl45nd5l69r6hi27z9q5bc3nv8")))) + (base32 "0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -664,7 +662,7 @@ (define-public bcachefs-tools In addition, bcachefs provides all the functionality of bcache, a block-layer caching system, and lets you assign different roles to each device based on its performance and other characteristics.") - (license license:gpl2+)))) + (license license:gpl2+))) (define-public bcachefs-tools/static (package From patchwork Sun Sep 17 06:38:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ahmad Draidi X-Patchwork-Id: 53972 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 6708627BBEA; Sun, 17 Sep 2023 07:40:10 +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 8881627BBE2 for ; Sun, 17 Sep 2023 07:40:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhlRk-00033M-OZ; Sun, 17 Sep 2023 02:39:56 -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 1qhlRj-00032t-9H for guix-patches@gnu.org; Sun, 17 Sep 2023 02:39:55 -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 1qhlRj-0007oE-18 for guix-patches@gnu.org; Sun, 17 Sep 2023 02:39:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhlRq-0006QC-FA for guix-patches@gnu.org; Sun, 17 Sep 2023 02:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66043] [PATCH 2/2] gnu: bcachefs-tools: Restyle format. Resent-From: Ahmad Draidi Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 06:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66043 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66043@debbugs.gnu.org Cc: Ahmad Draidi Received: via spool by 66043-submit@debbugs.gnu.org id=B66043.169493275824615 (code B ref 66043); Sun, 17 Sep 2023 06:40:02 +0000 Received: (at 66043) by debbugs.gnu.org; 17 Sep 2023 06:39:18 +0000 Received: from localhost ([127.0.0.1]:48919 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhlR7-0006Ox-J1 for submit@debbugs.gnu.org; Sun, 17 Sep 2023 02:39:18 -0400 Received: from rainycloud.ext.redscript.org ([2402:28c0:4:1081::1]:51780) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhlR2-0006OU-AD for 66043@debbugs.gnu.org; Sun, 17 Sep 2023 02:39:13 -0400 Received: from localhost.localdomain (bba-86-99-176-46.alshamil.net.ae [86.99.176.46]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by rainycloud.ext.redscript.org (Postfix) with ESMTPSA id 9714A86E; Sun, 17 Sep 2023 06:38:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-rsa; t=1694932739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QbbTcweI924GT8kPSIoBCgbMkged0a61iA+X/99HL38=; b=UJd8YKPpS3sTUihao7H1ycUyU1vKQegEDs1OEo+tOuVC13heL4VNfjjiH4vxhvfBw+Koch U8ORJ1vT2nZJvwhKnVqHe2xXFaX6OXQMkOYIBijRrFpoQkkAZH/GpkQ23toD6dW/EK2Hyf Zvadp9RJKHx473ZI8uI6ElAn5G6vFLtddNkwpMxIXerAu8TsmtIsFyPHsfbKKurKx59GCV wGfpWUfAUpgcJm8GCWUOvLUlI/iQLBi5wPKrpHQVf1YGobF7USF7sQicmJTUSOEdVr3y2w msmLAIZDJY+HtZKfiQWpsxtUsiXAnq3aBSvlH+b94X+1cQKl0iKoiozJ7jN0DZ/5SsmJNm uLi4fQJae0QVz4O8R1cs4Qizm3qYvwFEYsTwkeuiG3wZnzk+NDwNFhjvSICh6hgWkKBxtf OOBeQJQYslovMcK6wtQpJs5cGqSPcJYghpSiaCscgAcTTNlvSd/42oiP5Po/kx3Lt7xl6T rpn6ql8H2RAXa9ta66wPGMFbpQ7CiMPdDP0B4AxNx3nwN++VWKzlnbnRmsfaGk6psKl0N+ qWEb8wSD5aJo86y//MVvcF2K5INndO6t5jAKABeJWh6DHip5TIjLcZzz0dsiJshQwBsAKo HuKwlKaFwN5YfkIhZrf5wuimA0aOcdOeEay+CS9iMESE+wMeLClsA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=redscript.org; s=mail1-ed25519; t=1694932739; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QbbTcweI924GT8kPSIoBCgbMkged0a61iA+X/99HL38=; b=uwAMa0QeEEB5WSBWRl5JXGDo+5i1z/BaR+UHT6EPWeRBwn/S1mT3HUYYv6xXOTVIxTwt1L vb7OPGlKEGG4sIBw== Date: Sun, 17 Sep 2023 10:38:01 +0400 Message-ID: <3e7fa3295d876267df6babbb9a6578a4891822b2.1694931512.git.a.r.draidi@redscript.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: Ahmad Draidi X-ACL-Warn: , Ahmad Draidi via Guix-patches X-Patchwork-Original-From: Ahmad Draidi via Guix-patches via From: Ahmad Draidi 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 (bcachefs-tools): Reformat with 'guix style' and manually break some long lines. --- gnu/packages/file-systems.scm | 163 ++++++++++++++++++---------------- 1 file changed, 84 insertions(+), 79 deletions(-) diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index efa26a199a..58fb1b5363 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -575,84 +575,89 @@ (define-public gphotofs (license license:gpl2+))) (define-public bcachefs-tools - (package - (name "bcachefs-tools") - (version "1.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://evilpiepirate.org/git/bcachefs-tools.git") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8")))) - (build-system gnu-build-system) - (arguments - (list #:make-flags - #~(list (string-append "VERSION=" #$version) ; ‘v…-nogit’ otherwise - (string-append "PREFIX=" #$output) - "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" - (string-append "CC=" #$(cc-for-target)) - (string-append "PKG_CONFIG=" #$(pkg-config-for-target)) - ;; ‘This will be less of an option in the future, as more - ;; code gets rewritten in Rust.’ - "NO_RUST=better") - #:phases - #~(modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'check - ;; The test suite is moribund upstream (‘never been useful’), - ;; but let's keep running it as a sanity check until then. - (lambda* (#:key tests? make-flags #:allow-other-keys) - (when tests? - ;; We must manually build the test_helper first. - (apply invoke "make" "tests" make-flags) - (invoke (string-append - #$(this-package-native-input "python-pytest") - "/bin/pytest") "-k" - ;; These fail (‘invalid argument’) on kernels - ;; with a previous bcachefs version. - (string-append "not test_format and " - "not test_fsck and " - "not test_list and " - "not test_list_inodes and " - "not test_list_dirent"))))) - (add-after 'install 'patch-shell-wrappers - ;; These are overcomplicated wrappers that invoke readlink(1) - ;; to exec the appropriate bcachefs(8) subcommand. We can - ;; simply patch in the latter file name directly, and do. - (lambda _ - (let ((sbin/ (string-append #$output "/sbin/"))) - (substitute* (find-files sbin/ (lambda (file stat) - (not (elf-file? file)))) - (("SDIR=.*") "") - (("\\$\\{SDIR.*}/") sbin/)))))))) - (native-inputs - (cons* pkg-config - ;; For generating documentation with rst2man. - python - python-docutils - ;; For tests. - python-pytest - (if (member (%current-system) (package-supported-systems valgrind)) - (list valgrind) - '()))) - (inputs - (list eudev - keyutils - libaio - libscrypt - libsodium - liburcu - `(,util-linux "lib") - lz4 - zlib - `(,zstd "lib"))) - (home-page "https://bcachefs.org/") - (synopsis "Tools to create and manage bcachefs file systems") - (description - "The bcachefs-tools are command-line utilities for creating, checking, + (package + (name "bcachefs-tools") + (version "1.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://evilpiepirate.org/git/bcachefs-tools.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0wgqclkkdkqis3aq6wp0kcn1bsynybm3dnpcf7vlcvx85kdmcxg8")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags #~(list (string-append "VERSION=" + #$version) ;‘v…-nogit’ otherwise + (string-append "PREFIX=" + #$output) + "INITRAMFS_DIR=$(PREFIX)/share/initramfs-tools" + (string-append "CC=" + #$(cc-for-target)) + (string-append "PKG_CONFIG=" + #$(pkg-config-for-target)) + ;; ‘This will be less of an option in the future, as more + ;; code gets rewritten in Rust.’ + "NO_RUST=better") + #:phases #~(modify-phases %standard-phases + (delete 'configure) ;no configure script + (replace 'check + ;; The test suite is moribund upstream (‘never been + ;; useful’), but let's keep running it as a sanity + ;; check until then. + (lambda* (#:key tests? make-flags #:allow-other-keys) + (when tests? + ;; We must manually build the test_helper first. + (apply invoke "make" "tests" make-flags) + (invoke (string-append #$(this-package-native-input + "python-pytest") + "/bin/pytest") "-k" + ;; These fail (‘invalid argument’) on kernels + ;; with a previous bcachefs version. + (string-append "not test_format and " + "not test_fsck and " + "not test_list and " + "not test_list_inodes and " + "not test_list_dirent"))))) + (add-after 'install 'patch-shell-wrappers + ;; These are overcomplicated wrappers that invoke readlink(1) + ;; to exec the appropriate bcachefs(8) subcommand. We can + ;; simply patch in the latter file name directly, and do. + (lambda _ + (let ((sbin/ (string-append #$output "/sbin/"))) + (substitute* (find-files sbin/ + (lambda (file stat) + (not (elf-file? file)))) + (("SDIR=.*") + "") + (("\\$\\{SDIR.*}/") + sbin/)))))))) + (native-inputs (cons* pkg-config + ;; For generating documentation with rst2man. + python + python-docutils + ;; For tests. + python-pytest + (if (member (%current-system) + (package-supported-systems valgrind)) + (list valgrind) + '()))) + (inputs (list eudev + keyutils + libaio + libscrypt + libsodium + liburcu + `(,util-linux "lib") + lz4 + zlib + `(,zstd "lib"))) + (home-page "https://bcachefs.org/") + (synopsis "Tools to create and manage bcachefs file systems") + (description + "The bcachefs-tools are command-line utilities for creating, checking, and otherwise managing bcachefs file systems. Bcachefs is a @acronym{CoW, copy-on-write} file system supporting native @@ -662,7 +667,7 @@ (define-public bcachefs-tools In addition, bcachefs provides all the functionality of bcache, a block-layer caching system, and lets you assign different roles to each device based on its performance and other characteristics.") - (license license:gpl2+))) + (license license:gpl2+))) (define-public bcachefs-tools/static (package