From patchwork Wed Apr 9 06:35:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Grigory Shepelev X-Patchwork-Id: 41484 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 A88AB27BC49; Wed, 9 Apr 2025 07:40:43 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 AF32D27BC4A for ; Wed, 9 Apr 2025 07:40:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2P6U-0005P1-45; Wed, 09 Apr 2025 02: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 1u2P6S-0005Ml-3n for guix-patches@gnu.org; Wed, 09 Apr 2025 02:40:04 -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 1u2P6R-0001Rl-Q8 for guix-patches@gnu.org; Wed, 09 Apr 2025 02:40:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=mKI+rB/ptz/ItkvmooEu2xuU9IjHmurRWMMWb8mN4j4=; b=W3VhwgL1yRO8rJvzQITt4Os5VdODww60iBaHYI/EDHCzYWO0sOebmCSxfcWHttgKwEm6lztXJyH7aUcfps0Wrzb+Hq3HBjb0XJBhHJL3zPeBJ2lZWZukRIxB/9U8k4ISlnotxPsf8ivySsxGqJyOHDLcIObT3M26oqLRkg2Ag6lX8Re1PuIgMoI3D7/9us9sBpUw9B8O1YFiFoAkoXtnYSVZhT7CoxCicuZ1jvtxQ3QRNNzY3XXk/eQW6H+EyWWm2WvU/raCsJvF78L910/JWxr03xzpxoBbU/iIcY+2RcY3V8LfwTZEUG4SCBLTr1LguCOQrSUEyzOdDxF7iIbl3g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2P6R-0007Fa-02 for guix-patches@gnu.org; Wed, 09 Apr 2025 02:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77664] [PATCH 2/3] gnu: Add spdk. Resent-From: Grigory Shepelev Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Apr 2025 06:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 77664 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77664@debbugs.gnu.org Cc: Grigory Shepelev X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.174418076227754 (code B ref -1); Wed, 09 Apr 2025 06:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Apr 2025 06:39:22 +0000 Received: from localhost ([127.0.0.1]:36968 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u2P5l-0007Da-Lp for submit@debbugs.gnu.org; Wed, 09 Apr 2025 02:39:22 -0400 Received: from lists.gnu.org ([2001:470:142::17]:44972) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1u2P5j-0007Cp-Hv for submit@debbugs.gnu.org; Wed, 09 Apr 2025 02:39:20 -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 1u2P5S-0005Ia-RB for guix-patches@gnu.org; Wed, 09 Apr 2025 02:39:03 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2P5Q-0001JS-Ey for guix-patches@gnu.org; Wed, 09 Apr 2025 02:39:02 -0400 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-549946c5346so7535603e87.2 for ; Tue, 08 Apr 2025 23:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1744180738; x=1744785538; darn=gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mKI+rB/ptz/ItkvmooEu2xuU9IjHmurRWMMWb8mN4j4=; b=kab7TJ4gtE6SELpj/mZigugonWngwHZOT5eE7MIibHrE9BVcN7OfA8zMW5Rr/NaAJE 1p0nhU5BQQSxGw1xcrZ2tuVppZs3iJ04ca3H8l6gK0/9A9e0cWYR8wVzJsamoCUi0VFi sG4gD2M2v7Y+66l40FXJnHDKr0+6yO+OGDd6VayyuBMFxexHVuWRLeybDwzrPGX/Uc+o Siz5tWsiGYBHINz5pGs3IP0R7wnW7qqxw/02gQ1ccHzhPiGcDEW7e2o5mGsmDqE29PwX oka0qK998kEfMrOlkimgxUGMqUICbDqJY5v1bAY97EYstT7nTdGsTt4Y03+CWxuhL5qZ WU8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744180738; x=1744785538; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mKI+rB/ptz/ItkvmooEu2xuU9IjHmurRWMMWb8mN4j4=; b=Yq9OPAElwLpjhio+HoCpHNPpm6VWxq9tGceKJ374wB4kdE8smLukcxrYg8SXNjboty kSy11USuLF/fECuBnYsZVK5XPGAeWbaulmEKKQqYXNPfG1LXf5sQoWi76ljm6jpd9oY+ hEvxkcn4PZ++OQWhLDtMK30llC5ZaYcl1GRRc7IW1gflfkx5PlafUUkKYS+/m5n48J21 EB/TsEK+co3wtomcxWg2VXilXpS4ptlNy09Z7WRnZCB/ff8CNAynOTz//gTHNTl4oKh5 zl7I9NyaTcNeCFrNNwr93LjzSA7Tn8mIgoRQmw/ViVeI6mlZafQFZF2idxmLkq1dAhR3 Qnkw== X-Gm-Message-State: AOJu0YyAw57OGmmrFaZQJjk8H2IfEr4DgtyLGCinwLX00p+Von+9n8Jf ul47RpWpRLY7xB/jnWOXA9Y6og7oVM0UIdN2aI3N48+OplBz8wAhodTljXH5 X-Gm-Gg: ASbGncsHfRlBXPsn2m2akiQr5GLulVfgJNHPrDQOELrFw+5zZl8D6Iz3D23EJta+S/z mHcXJiS8zLN++h4pGojR8bxx2Dn22TnRL9PiuEhYkvCoUWDf0FMa9Gzv7mTfh4MivliOykUnTqF aOtdzqAPXjXOQaQk7cV5wr+bhTawwppNZaxP87ObafTRL7GkJYSVjmVJ07wGnazCsA0uAX7s/1/ 4Iig0s04AbNrk7cnXXoP+8zDnK79zXjivdkXxe4vnFC8FEPHCuxUZ3iVvzMi7cmyh0BxqIdr2Jp iJYqC6kLBldMqL2SWFhxqoj6iKIGZh1i X-Google-Smtp-Source: AGHT+IEHl/+33BoCy+S5kPbQRZHHIDIJhGTjp5sAw9DaA7xkVwi4B/Bi6Nq56uN2/81JYY873TEhXw== X-Received: by 2002:a05:6512:1242:b0:54a:cc25:dbe9 with SMTP id 2adb3069b0e04-54c444ff2f0mr308216e87.26.1744180737905; Tue, 08 Apr 2025 23:38:57 -0700 (PDT) Received: from localhost ([46.172.4.246]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-54c455e7a42sm55245e87.94.2025.04.08.23.38.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Apr 2025 23:38:57 -0700 (PDT) From: Grigory Shepelev Date: Wed, 9 Apr 2025 09:35:49 +0300 Message-ID: <20250409063723.16034-3-shegeley@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250409063723.16034-2-shegeley@gmail.com> References: <20250409063723.16034-2-shegeley@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::136; envelope-from=shegeley@gmail.com; helo=mail-lf1-x136.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , 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 Line 132 of this patch was advised by @wigust in Russian-speaking telegram guix community. #$(this-package-input package derivation) won't work cause: guix/packages.scm:964 #+begin_src scheme (define (lookup-input inputs name) "Lookup NAME among INPUTS, an input list." ;; Note: Currently INPUTS is assumed to be an input list that contains input ;; labels. In the future, input labels will be gone and this procedure will ;; check package names. (match (assoc-ref inputs name) ((obj) obj) ((obj _) obj) (#f #f))) #+end_src --- gnu/packages/storage.scm | 173 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 173 insertions(+) -- 2.48.1 diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm index 919b72736b..252012a506 100644 --- a/gnu/packages/storage.scm +++ b/gnu/packages/storage.scm @@ -21,7 +21,28 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages storage) + #:use-module (gnu packages autotools) + #:use-module (gnu packages commencement) + #:use-module (gnu packages llvm) + #:use-module (gnu packages backup) + #:use-module (gnu packages elf) + #:use-module (gnu packages bootstrap) + #:use-module (gnu packages maths) + #:use-module (gnu packages gcc) + #:use-module (gnu packages base) + #:use-module (gnu packages compression) + #:use-module (guix build-system python) + + #:use-module (guix build-system gnu) + #:use-module (guix gexp) + #:use-module (gnu packages python-build) + #:use-module (gnu packages elf) + #:use-module (gnu packages libbsd) + #:use-module (gnu packages linux) + #:use-module (gnu packages dpdk) + #:use-module (gnu packages check) #:use-module (guix download) + #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils) @@ -271,3 +292,155 @@ (define-public ceph license:cc-by-sa3.0 ;documentation license:bsd-3 ;isa-l,jerasure,++ license:expat)))) ;civetweb,java bindings + +(define-public spdk + (package + (name "spdk") + (version "24.09") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/spdk/spdk") + (commit (string-append "v" version)))) + (sha256 + (base32 "1cx0yj3ibmbngqsjdlnh7qg7as9mzpbiw0zscraw07b4rs6g0s6q")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f + ;; XXX: Issue with dpdk: error: depends on 'libspdk_env_dpdk_rpc.so.6.0', + ;; which cannot be found in RUNPATH + #:imported-modules + (append %default-gnu-imported-modules + %python-build-system-modules) + #:validate-runpath? #f + #:modules '((guix build gnu-build-system) + (guix build utils) + ((guix build python-build-system) #:prefix python:) + (ice-9 rdelim) + (ice-9 popen)) + #:configure-flags + #~(list "--with-shared" + (string-append "--prefix=" #$output) + (string-append "--with-dpdk=" #$(this-package-input "dpdk"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'substitute-git-submodules + (lambda _ + (rmdir "isa-l") + (symlink #$(package-source (this-package-input "isa-l")) "isa-l"))) + (replace 'configure + (lambda* (#:key configure-flags #:allow-other-keys) + (substitute* "configure" + (("#! /bin/sh") (string-append "#!" (which "sh")))) + (setenv "CC" #$(cc-for-target)) + (setenv "CFLAGS" "-mssse3") + (setenv "CONFIG_SHELL" (which "bash")) + (setenv "LDFLAGS" "-lbsd") + (setenv "SHELL" (which "bash")) + (apply invoke "./configure" configure-flags))) + (add-before 'install 'set-install-environment + ;; same as ceph + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (py3sitedir + (string-append out "/lib/python" + #$(version-major+minor + (package-version python)) + "/site-packages"))) + (setenv "PYTHONPATH" py3sitedir)))) + (add-after 'install 'patchelf + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* [(binaries '("iscsi_tgt" "nvmf_tgt" + "spdk_dd" "spdk_lspci" "spdk_nvme_discover" + "spdk_tgt" "spdk_top" "spdk_trace" + "spdk_nvme_identify" "spdk_nvme_perf" + "spdk_trace_record" "vhost")) + (ld-so (search-input-file inputs #$(glibc-dynamic-linker))) + (libs + (list + (string-append #$(this-package-input "libbsd") "/lib") + (string-append #$(this-package-input "libarchive") "/lib") + (string-append #$(this-package-input "numactl") "/lib") + (string-append #$(gexp-input util-linux "lib") "/lib") + (string-append #$(this-package-input "openssl") "/lib") + (string-append #$(this-package-input "openlibm") "/lib") + (string-append #$(this-package-input "libaio") "/lib") + (string-append #$(this-package-input "dpdk") "/lib") + (string-append #$(this-package-input "fuse") "/lib") + (string-append #$(this-package-input "gcc") "/lib") + (string-append #$(this-package-input "glibc") "/lib"))) + (rpath* (apply string-append (map (lambda (l) (string-append l ":")) libs)))] + (for-each + (lambda (b) + (let [(file (string-append #$output "/bin/" b))] + (invoke "patchelf" "--set-interpreter" ld-so file) + + (let* ((pipe (open-pipe* OPEN_READ "patchelf" "--print-rpath" file)) + (line (read-line pipe))) + (and (zero? (close-pipe pipe)) + (invoke "patchelf" "--set-rpath" (string-append rpath* line) + file))) + (wrap-program file + `("LD_LIBRARY_PATH" ":" prefix (,(string-append #$output "/lib")))))) + binaries)))) + (add-after 'patchelf 'python:wrap + (assoc-ref python:%standard-phases 'wrap)) + (add-after 'python:wrap 'wrap-python-scripts + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (scripts '("bin/spdk_cli" "bin/spdk_rpc" )) + (dependencies (map (lambda (input) + (assoc-ref inputs input)) + '("python-configshell-fb"))) + (python-version #$(version-major+minor (package-version python))) + (sitedir (lambda (package) + (string-append package "/lib/python" + python-version "/site-packages"))) + (PYTHONPATH (string-join (map sitedir (cons out dependencies)) ":"))) + (for-each (lambda (executable) + (wrap-program (string-append out "/" executable) + `("GUIX_PYTHONPATH" ":" prefix (,PYTHONPATH)))) + scripts))))))) + (native-inputs + (list autoconf + automake + patchelf + pkg-config + python-pip + python-setuptools + python-wheel + python-configshell-fb + python-wrapper)) + (inputs + (list + ;; ↓ those are copied from NixPkgs + cunit + dpdk + fuse + jansson + libaio + libbsd + elfutils + libpcap + libnl + numactl + openssl + ncurses + zlib + zstd + glibc + (list gcc "lib") + + ;; ↓ had to add those + isa-l + openlibm + (list util-linux "lib") ;; ↓ + libarchive)) + (home-page "https://spdk.io/") + (synopsis "The Storage Performance Development Kit") + (description + "SPDK provides a set of tools and libraries for writing high +performance,scalable, user-mode storage applications.") + (license license:bsd-3)))