From patchwork Mon May 15 18:19:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Lechner X-Patchwork-Id: 50026 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 921D227BBEA; Mon, 15 May 2023 19:20:31 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 B566827BBE2 for ; Mon, 15 May 2023 19:20:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pycnr-0004Is-1J; Mon, 15 May 2023 14:20:11 -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 1pycnl-0004Ht-39 for guix-patches@gnu.org; Mon, 15 May 2023 14:20:05 -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 1pycnj-00006Z-Mk for guix-patches@gnu.org; Mon, 15 May 2023 14:20:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pycni-0001yF-Jm for guix-patches@gnu.org; Mon, 15 May 2023 14:20:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63525] [PATCH] gnu: {disk|linux|scsi}.scm: Relocate disk-related packages; non-functional change. Resent-From: Felix Lechner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 May 2023 18:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63525 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63525@debbugs.gnu.org Cc: Felix Lechner X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16841747797540 (code B ref -1); Mon, 15 May 2023 18:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 15 May 2023 18:19:39 +0000 Received: from localhost ([127.0.0.1]:44342 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pycnK-0001xY-HG for submit@debbugs.gnu.org; Mon, 15 May 2023 14:19:39 -0400 Received: from lists.gnu.org ([209.51.188.17]:52162) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pycnG-0001xH-RN for submit@debbugs.gnu.org; Mon, 15 May 2023 14:19:35 -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 1pycnG-0004DX-Hi for guix-patches@gnu.org; Mon, 15 May 2023 14:19:34 -0400 Received: from sail-ipv4.us-core.com ([208.82.101.137]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1pycnE-0008Re-1k for guix-patches@gnu.org; Mon, 15 May 2023 14:19:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=2017; bh=mvAR+sIttOueMff BYPCDIy5iWBt3yMbPWwG5WJ6n0eo=; h=date:subject:cc:to:from; d=lease-up.com; b=Z16+6claxh/nmSLAho+toPbwDbUkJzfM+frBxtGv7e0ZIVgMALB4 +UokPotkljJjbbv7nr3mI/oFIy7Mp1DypRwNf1aTqYUK3thOjwWbuwUwFx6CXu1KdudZCE r8uVvMAh71RXSTnj7JYoxXPaO3w8vp2I9ucx5rIAzTTFNqgOo= Received: by sail-ipv4.us-core.com (OpenSMTPD) with ESMTPSA id 1775ae80 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Mon, 15 May 2023 18:19:25 +0000 (UTC) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id e751c0f7; Mon, 15 May 2023 18:19:25 +0000 (UTC) Date: Mon, 15 May 2023 11:19:05 -0700 Message-Id: <29082f33471e69cd0360c230575e86a9661c4f26.1684174698.git.felix.lechner@lease-up.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Received-SPF: pass client-ip=208.82.101.137; envelope-from=felix.lechner@us-core.com; helo=sail-ipv4.us-core.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Felix Lechner X-ACL-Warn: , Felix Lechner via Guix-patches X-Patchwork-Original-From: Felix Lechner via Guix-patches via From: Felix Lechner 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 Moves the following disk-related pacakges pursuant to the proposal here. [1] hdparm: linux.scm --> disk.scm lsscsi: linux.scm --> scsi.scm [1] https://lists.gnu.org/archive/html/guix-devel/2023-05/msg00189.html * gnu/packages/{disk|linux}.scm: Move hdparm to disk.scm; closer to sdparm. * gnu/packages/{linux|scsi}.scm: Move lsscsi to scsi.scm. --- gnu/packages/disk.scm | 38 ++++++++++++++++++++++++++ gnu/packages/linux.scm | 60 +----------------------------------------- gnu/packages/scsi.scm | 33 +++++++++++++++++++---- 3 files changed, 67 insertions(+), 64 deletions(-) base-commit: 6e38ec447f98383e0722ac300734f8d7c8c5c7b0 diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 894a542171..6dcc76e4eb 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -515,6 +515,44 @@ (define-public fatfsck/static and a @command{fsck.vfat} compatibility symlink for use in an initrd.") (license (package-license dosfstools)))) +(define-public hdparm + (package + (name "hdparm") + (version "9.65") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/hdparm/hdparm/" + "hdparm-" version ".tar.gz")) + (sha256 + (base32 + "0jssagggg52ssl9kg99m88afghj7bm1854vyf4p96q6h23wjjjfi")))) + (build-system gnu-build-system) + (arguments + (list #:make-flags + #~(list (string-append "binprefix=" #$output) + (string-append "manprefix=" #$output) + (string-append "CC=" #$(cc-for-target)) + ;; Let Guix strip binaries and not break cross-compilation. + "STRIP=true") + #:phases + #~(modify-phases %standard-phases + (delete 'configure)) ; no configure script + #:tests? #f)) ; no test suite + (home-page "https://sourceforge.net/projects/hdparm/") + (synopsis "View and tune ATA disk drive parameters") + (description + "@command{hdparm} is a command-line utility to control ATA controllers and +disk drives. It can increase performance and/or reliability by careful tuning +of hardware settings like power and acoustic management, DMA modes, and caching. +It can also display detailed device information, or be used as a simple +performance benchmarking tool. + +@command{hdparm} provides a command line interface to various Linux kernel +interfaces provided by the SATA/ATA/SAS @code{libata} subsystem, and the older +IDE driver subsystem. Many external USB drive enclosures with SCSI-ATA Command +Translation (@dfn{SAT}) are also supported.") + (license (license:non-copyleft "file://LICENSE.TXT")))) + (define-public sdparm (package (name "sdparm") diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 90c1adde53..3ac792c7b6 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -111,6 +111,7 @@ (define-module (gnu packages linux) #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) #:use-module (gnu packages dbm) + #:use-module (gnu packages disk) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -3035,27 +3036,6 @@ (define-public jitterentropy-rngd (license (list license:bsd-3 ; or license:gpl2+)))) -(define-public lsscsi - (package - (name "lsscsi") - (version "0.32") - (source (origin - (method url-fetch) - (uri (string-append - "http://sg.danny.cz/scsi/lsscsi-" version ".tar.xz")) - (sha256 - (base32 - "0jp458m2b3wckr18qkln69i01152qlwz33zm49103lq8fgx0n6d4")))) - (build-system gnu-build-system) - (synopsis "Lists information about SCSI or NVMe devices in Linux") - (home-page "https://sg.danny.cz/scsi/lsscsi.html") - (description - "@command{lsscsi} lists SCSI logical units or SCSI targets. It can -also list NVMe namespaces or controllers and show the relationship between a -device's primary node name, its SCSI generic (sg) node name and its kernel -name.") - (license license:gpl2))) - (define-public ebtables (package (name "ebtables") @@ -5060,44 +5040,6 @@ (define-public singularity isolation or root privileges.") (license license:bsd-3))) -(define-public hdparm - (package - (name "hdparm") - (version "9.65") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/hdparm/hdparm/" - "hdparm-" version ".tar.gz")) - (sha256 - (base32 - "0jssagggg52ssl9kg99m88afghj7bm1854vyf4p96q6h23wjjjfi")))) - (build-system gnu-build-system) - (arguments - (list #:make-flags - #~(list (string-append "binprefix=" #$output) - (string-append "manprefix=" #$output) - (string-append "CC=" #$(cc-for-target)) - ;; Let Guix strip binaries and not break cross-compilation. - "STRIP=true") - #:phases - #~(modify-phases %standard-phases - (delete 'configure)) ; no configure script - #:tests? #f)) ; no test suite - (home-page "https://sourceforge.net/projects/hdparm/") - (synopsis "View and tune ATA disk drive parameters") - (description - "@command{hdparm} is a command-line utility to control ATA controllers and -disk drives. It can increase performance and/or reliability by careful tuning -of hardware settings like power and acoustic management, DMA modes, and caching. -It can also display detailed device information, or be used as a simple -performance benchmarking tool. - -@command{hdparm} provides a command line interface to various Linux kernel -interfaces provided by the SATA/ATA/SAS @code{libata} subsystem, and the older -IDE driver subsystem. Many external USB drive enclosures with SCSI-ATA Command -Translation (@dfn{SAT}) are also supported.") - (license (license:non-copyleft "file://LICENSE.TXT")))) - (define-public libnvme (package (name "libnvme") diff --git a/gnu/packages/scsi.scm b/gnu/packages/scsi.scm index f63b391dc1..642209db3a 100644 --- a/gnu/packages/scsi.scm +++ b/gnu/packages/scsi.scm @@ -19,8 +19,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages scsi) - #:use-module ((guix licenses) - #:select (gpl2+ bsd-2 bsd-3 lgpl2.1+)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) @@ -70,7 +69,10 @@ (define-public sg3-utils ;; "3 clause" to the newer "2 clause" version on 20180119. To save space ;; various source code files refer to a file called "BSD_LICENSE" [...]." ;; Some files (like sg_compare_and_write.c) retain their 3-clause headers! - (license (list gpl2+ bsd-2 bsd-3)))) + (license (list + license:gpl2+ + license:bsd-2 + license:bsd-3)))) (define-public libiscsi (package @@ -97,6 +99,27 @@ (define-public libiscsi (license (list ;; For the src, examples and test-tool directories, except ;; src/ld_iscsi.c. - gpl2+ + license:gpl2+ ;; For the lib and include directories. - lgpl2.1+)))) + license:lgpl2.1+)))) + +(define-public lsscsi + (package + (name "lsscsi") + (version "0.32") + (source (origin + (method url-fetch) + (uri (string-append + "http://sg.danny.cz/scsi/lsscsi-" version ".tar.xz")) + (sha256 + (base32 + "0jp458m2b3wckr18qkln69i01152qlwz33zm49103lq8fgx0n6d4")))) + (build-system gnu-build-system) + (synopsis "Lists information about SCSI or NVMe devices in Linux") + (home-page "https://sg.danny.cz/scsi/lsscsi.html") + (description + "@command{lsscsi} lists SCSI logical units or SCSI targets. It can +also list NVMe namespaces or controllers and show the relationship between a +device's primary node name, its SCSI generic (sg) node name and its kernel +name.") + (license license:gpl2)))