From unknown Sun Sep 07 17:04:57 2025 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) From: Felix Lechner 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) 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(-) 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))) base-commit: 6e38ec447f98383e0722ac300734f8d7c8c5c7b0 -- 2.40.1 From unknown Sun Sep 07 17:04:57 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Felix Lechner Subject: bug#63525: closed (Re: [bug#63525] [PATCH] gnu: {disk|linux|scsi}.scm: Relocate disk-related packages; non-functional change.) Message-ID: References: <87h6opujq2.wl-hako@ultrarare.space> <29082f33471e69cd0360c230575e86a9661c4f26.1684174698.git.felix.lechner@lease-up.com> X-Gnu-PR-Message: they-closed 63525 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 63525@debbugs.gnu.org Date: Thu, 24 Aug 2023 05:09:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1692853742-23581-1" This is a multi-part message in MIME format... ------------=_1692853742-23581-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63525: [PATCH] gnu: {disk|linux|scsi}.scm: Relocate disk-related packages;= non-functional change. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63525@debbugs.gnu.org. --=20 63525: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63525 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1692853742-23581-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63525-done) by debbugs.gnu.org; 24 Aug 2023 05:08:19 +0000 Received: from localhost ([127.0.0.1]:35875 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ2Zv-00067P-2d for submit@debbugs.gnu.org; Thu, 24 Aug 2023 01:08:19 -0400 Received: from [144.168.59.46] (port=60418 helo=mail.boiledscript.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ2Zs-00066v-1O for 63525-done@debbugs.gnu.org; Thu, 24 Aug 2023 01:08:16 -0400 Date: Thu, 24 Aug 2023 12:50:45 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1692853652; 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: in-reply-to:in-reply-to; bh=6+eW0142LHBcoUXyYHWxOtO5A4K4aRl4KqzRoPDCIR4=; b=JPgTzUT0Cr8+oSIE63Ft6UF2HXZQWRtFxtweMWArUyxlXWN6zSEv4FOcyShYqSZ3YTljM2 GVKroJBjZFbxuHx1HBB8lismhHiw6Db8PnB/jRM+EScY65GtJANq4RF5Om3FeKQxnmbqSe mG0UINBMQKNb3LPc+GoDigNFqokZ9Qux8rKOdRzXuEmkqJaI0xlQxIkkBivJEXIPuk/1GH rgWKAPcvfrXWZaJmquiA3yWRKofMEgMKN9FZGwIQlDwROh0Fg1V5UMkCfFjER51O6tMDMn ms4bJE9lMrPnODQ57XHhGiuccYwkUM+zk7bRy5bwDqYOtRDzQ02AMgFsTbU0QQ== Authentication-Results: mail.boiledscript.com; auth=pass smtp.mailfrom=hako@ultrarare.space Message-ID: <87h6opujq2.wl-hako@ultrarare.space> From: Hilton Chain To: Felix Lechner Subject: Re: [bug#63525] [PATCH] gnu: {disk|linux|scsi}.scm: Relocate disk-related packages; non-functional change. In-Reply-To: <29082f33471e69cd0360c230575e86a9661c4f26.1684174698.git.felix.lechner@lease-up.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII X-Spamd-Bar: / X-Spam-Score: 1.3 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Hello, On Tue, 16 May 2023 02:19:05 +0800, Felix Lechner via Guix-patches via wrote: > > Moves the following disk-related pacakges pursuant to the proposal here. [1] > > hdparm: linux.scm --> disk.scm > lssc [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 1.3 RDNS_NONE Delivered to internal network by a host with no rDNS X-Debbugs-Envelope-To: 63525-done Cc: 63525-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) Hello, On Tue, 16 May 2023 02:19:05 +0800, Felix Lechner via Guix-patches via wrote: > > 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. > --- I have split the changes into two commits and added commit messages for them. Applied as 63b2d9a8f1c5251d72d44a36929b0cdf19533971 and 160f78a4d92205df986ed9efcce7d3aac188cb24, thank you! ------------=_1692853742-23581-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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) From: Felix Lechner To: guix-patches@gnu.org Subject: [PATCH] gnu: {disk|linux|scsi}.scm: Relocate disk-related packages; non-functional change. 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 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.1 (-) X-Debbugs-Envelope-To: submit Cc: Felix Lechner X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) 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(-) 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))) base-commit: 6e38ec447f98383e0722ac300734f8d7c8c5c7b0 -- 2.40.1 ------------=_1692853742-23581-1--