From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvPw0-0008Aw-Oc for guix-patches@gnu.org; Fri, 22 Sep 2017 11:32:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvPvv-00061x-0B for guix-patches@gnu.org; Fri, 22 Sep 2017 11:32:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44347) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dvPvu-00061n-Tf for guix-patches@gnu.org; Fri, 22 Sep 2017 11:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dvPvu-00030G-O6 for guix-patches@gnu.org; Fri, 22 Sep 2017 11:32:02 -0400 Subject: [bug#28552] [PATCH 2/3] gnu: Add infiniband-diags. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:35087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dvPvI-0007gG-WD for guix-patches@gnu.org; Fri, 22 Sep 2017 11:31:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dvPvD-0004iL-8Z for guix-patches@gnu.org; Fri, 22 Sep 2017 11:31:25 -0400 From: Dave Love Date: Fri, 22 Sep 2017 16:04:06 +0100 Message-Id: <20170922150407.18134-2-fx@gnu.org> In-Reply-To: <20170922150407.18134-1-fx@gnu.org> References: <20170922150407.18134-1-fx@gnu.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28552@debbugs.gnu.org Cc: Dave Love * gnu/packages/fabric-management.scm (infiniband-diags): New variable. --- gnu/packages/fabric-management.scm | 69 +++++++++++++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 1 deletion(-) diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index abef18d36..a0e4b12c4 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -23,9 +23,13 @@ #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages bison) #:use-module (gnu packages flex) - #:use-module (gnu packages linux)) + #:use-module (gnu packages glib) + #:use-module (gnu packages linux) + #:use-module (gnu packages perl) + #:use-module (gnu packages pkg-config)) ;; Fixme: Done for the library, but needs support for running the daemon ;; (shepherd definition). @@ -70,3 +74,66 @@ also contains various tools for diagnosing and testing Infiniband networks that can be used from any machine and do not need to be run on a machine running the opensm daemon.") (license (list gpl2 bsd-2)))) + +(define-public infiniband-diags + (package + (name "infiniband-diags") + (version "2.0.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/linux-rdma/infiniband-diags/archive/" + version ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 "1ns9sjwvxnklhi47d6k5x8kxdk1n7f5362y45xwxqmr7gwfvpmwa")))) + (build-system gnu-build-system) + (inputs + `(("rdma-core" ,rdma-core) + ("opensm" ,opensm) + ("glib" ,glib))) + (outputs '("out" "lib")) + (native-inputs + ;; fixme: needs rst2man for man pages + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("perl" ,perl) + ("pkg-config" ,pkg-config))) + (arguments + '(#:configure-flags + (list (string-append "CPPFLAGS=-I" (assoc-ref %build-inputs "opensm") + "/include/infiniband") + (string-append "--with-perl-installdir=" (assoc-ref %outputs "lib") + "/lib/perl5/vendor_perl") + "--disable-static") + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autotools + (lambda _ + (zero? (system "./autogen.sh")))) + (add-after 'install 'licence + (lambda _ + (let ((doc (string-append (assoc-ref %outputs "lib") "/share/doc"))) + (mkdir-p doc) + (install-file "COPYING" doc)))) + (add-after 'install-file 'move-perl + ;; Avoid perl in lib closure + (lambda _ + (let ((perlout (string-append (assoc-ref %outputs "out") "/lib")) + (perlin (string-append (assoc-ref %outputs "lib") + "/lib/perl5"))) + (mkdir-p perlout) + (zero? (system* "mv" perlin perlout)))))))) + (home-page "https://github.com/linux-rdma/infiniband-diags") + (synopsis "Infiniband diagnotic tools") + (description "\ +A set of utilities designed to help configure, debug, and maintain infiniband +fabrics. Many tools and utilities are provided, some with similar +functionality. + +In addition to the utilities provided, a sub-library libibnetdisc, is provided +to scan an entire IB fabric and return data structures representing it. The +interface to this library is not guaranteed to be stable.") + (license + (list gpl2 bsd-2)))) ; dual -- 2.11.0