diff options
Diffstat (limited to 'sys-apps/nvme-cli')
| -rw-r--r-- | sys-apps/nvme-cli/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch | 72 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch | 37 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch | 61 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/metadata.xml | 1 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild | 55 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild | 38 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild | 34 |
8 files changed, 0 insertions, 301 deletions
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index 47bc3591ad5f..edd4c759e100 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1,4 +1 @@ -DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff -DIST nvme-cli-2.0.tar.gz 646320 BLAKE2B 81a8161091071be4e98d4feb78b3f3edaed07262212a8950c1882e3b46f38cd82d8cd8bfec62b3971feda6e82d297338e5541c8eda33c8b6f714d3b3ce000c25 SHA512 24a00ee8e0fc963c1757797413ff5725cec18f821a714d6bbbf37906010d72934d6fdd7b466c085f13716a5279d1a7bd3254ee474e37a0ecd00a85ef23e12417 -DIST nvme-cli-2.1.2.tar.gz 674414 BLAKE2B e71e32a371c2cebfd7f66539490baa8e8074c5bd21afa2470e73c763c752318ca5abc1fe1a4d3f346137dcdbb604889a23955269f209222384a629e8d6817d6a SHA512 2162a6967a221a4ae7e0261748c26a10ff43d5b592039e29578d8310cf176428d528c2d510c0b58419b70bd6d28f4d2c77f0cd27606d87079c64289d5d14f930 DIST nvme-cli-2.2.1.gh.tar.gz 706199 BLAKE2B e0026fc2ee3edeffa18b0fc8365703e3de6f69cdd665878e8589fefa334ddb78f3fdf2768bd5a141dc27b0a7403d0fd7472db763e7e41b55a3cac314105faac3 SHA512 8efa94d49a4d443cdb0310386733e88117f17719b05044f11e63e2a09143fce55918171b457a467371263ebb2e36552558aad249ae4dbd27941af79fe9722e26 diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch deleted file mode 100644 index 27a80eda9955..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-1.16-bash-completions.patch +++ /dev/null @@ -1,72 +0,0 @@ -This fixes several issues: -* the upstream rebase error (unclosed double quote) -* typo "lugin_seagate_opts" -* "readonly" with assignment is problematic on Bash 5.1.x - -Gentoo bug: https://bugs.gentoo.org/852764 -Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574 -Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e - -Author: Karlson2k (Evgeny Grin) -Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru> - -diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh -index 41938d77..31afb3b3 100644 ---- a/completions/bash-nvme-completion.sh -+++ b/completions/bash-nvme-completion.sh -@@ -3,12 +3,13 @@ - # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015 - - # Constant to indicate command has no options --readonly NO_OPTS="" -+NO_OPTS="" -+readonly NO_OPTS - - # Associative array of plugins and associated subcommands - # Order here is same as PLUGIN_OBJS in Makefile - typeset -A _plugin_subcmds --readonly _plugin_subcmds=( -+_plugin_subcmds=( - [intel]="id-ctrl internal-log lat-stats \ - set-bucket-thresholds lat-stats-tracking \ - market-name smart-log-add temp-stats" -@@ -55,10 +56,11 @@ readonly _plugin_subcmds=( - [nvidia]="id-ctrl" - [ymtc]="smart-log-add" - ) -+readonly _plugin_subcmds - - # Associative array mapping plugins to coresponding option completions - typeset -A _plugin_funcs --readonly _plugin_funcs=( -+_plugin_funcs=( - [intel]="plugin_intel_opts" - [amzn]="plugin_amzn_opts" - [lnvm]="plugin_lnvm_opts" -@@ -77,6 +79,7 @@ readonly _plugin_funcs=( - [nvidia]="plugin_nvidia_opts" - [ymtc]="plugin_ymtc_opts" - ) -+readonly _plugin_funcs - - # Top level commands - _cmds="list list-subsys id-ctrl id-ns \ -@@ -101,8 +104,7 @@ _cmds="list list-subsys id-ctrl id-ns \ - connect disconnect disconnect-all gen-hostnqn \ - show-hostnqn dir-receive dir-send virt-mgmt \ - rpmb boot-part-log fid-support-effects-log \ -- supported-log-pages lockdown" -- supported-log-pages list-endgrp" -+ supported-log-pages lockdown list-endgrp" - - # Add plugins: - for plugin in "${!_plugin_subcmds[@]}"; do -@@ -983,7 +985,7 @@ plugin_micron_opts () { - return 0 - } - --lugin_seagate_opts () { -+plugin_seagate_opts () { - local opts="" - local compargs="" - diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch deleted file mode 100644 index 27c9667c827c..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://github.com/linux-nvme/nvme-cli/commit/4729b13f36d4713ce1162dc1d4425d44e1474078.patch -https://bugs.gentoo.org/829705 -(and an additional hunk for https://bugs.gentoo.org/830744) - -From: Ariadne Conill <ariadne@dereferenced.org> -Date: Mon, 26 Apr 2021 00:41:20 -0600 -Subject: [PATCH] nvme-rpmb: Add limits.h due to missing PATH_MAX definition - -Commit 21f40f38b introduced new use of PATH_MAX, but did not add the -limits.h header. This resulted in nvme-cli failing to build on -ppc64le systems using the musl C library. - -Signed-off-by: Ariadne Conill <ariadne@dereferenced.org> -[dwagner: removed nvme-topology.c bits] -Signed-off-by: Daniel Wagner <dwagner@suse.de> ---- a/nvme-rpmb.c -+++ b/nvme-rpmb.c -@@ -25,6 +25,7 @@ - #include <sys/socket.h> - #include <linux/if_alg.h> - #include <linux/socket.h> -+#include <limits.h> - - #include "nvme.h" - #include "libnvme.h" -diff --git a/nvme-topology.c b/nvme-topology.c -index 0a22f6b..6d510f2 100644 ---- a/nvme-topology.c -+++ b/nvme-topology.c -@@ -1,6 +1,7 @@ - #include <stdio.h> - #include <stdlib.h> - #include <errno.h> -+#include <limits.h> - #include <unistd.h> - #include <fcntl.h> - #include <sys/stat.h> diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch b/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch deleted file mode 100644 index 3ddad04a5518..000000000000 --- a/sys-apps/nvme-cli/files/nvme-cli-2.0-bash-completions.patch +++ /dev/null @@ -1,61 +0,0 @@ -This fixes several issues: -* typo "lugin_seagate_opts" -* "readonly" with assignment resulting in error on Bash 5.x - -Gentoo bug: https://bugs.gentoo.org/852764 -Upstream: https://github.com/linux-nvme/nvme-cli/pull/1574 -Upstream: https://github.com/linux-nvme/nvme-cli/commit/25fd8c707b106ca0763402566ad657ef710bf09e - -Author: Karlson2k (Evgeny Grin) -Signed-off-by: Karlson2k (Evgeny Grin) <k2k@narod.ru> - -diff --git a/completions/bash-nvme-completion.sh b/completions/bash-nvme-completion.sh -index 5e0eb23b..469ba3e2 100644 ---- a/completions/bash-nvme-completion.sh -+++ b/completions/bash-nvme-completion.sh -@@ -3,12 +3,13 @@ - # Kelly Kaoudis kelly.n.kaoudis at intel.com, Aug. 2015 - - # Constant to indicate command has no options --readonly NO_OPTS="" -+NO_OPTS="" -+readonly NO_OPTS - - # Associative array of plugins and associated subcommands - # Order here is same as PLUGIN_OBJS in Makefile - typeset -A _plugin_subcmds --readonly _plugin_subcmds=( -+_plugin_subcmds=( - [intel]="id-ctrl internal-log lat-stats \ - set-bucket-thresholds lat-stats-tracking \ - market-name smart-log-add temp-stats" -@@ -53,10 +54,11 @@ readonly _plugin_subcmds=( - [nvidia]="id-ctrl" - [ymtc]="smart-log-add" - ) -+readonly _plugin_subcmds - - # Associative array mapping plugins to coresponding option completions - typeset -A _plugin_funcs --readonly _plugin_funcs=( -+_plugin_funcs=( - [intel]="plugin_intel_opts" - [amzn]="plugin_amzn_opts" - [memblaze]="plugin_memblaze_opts" -@@ -74,6 +76,7 @@ readonly _plugin_funcs=( - [nvidia]="plugin_nvidia_opts" - [ymtc]="plugin_ymtc_opts" - ) -+readonly _plugin_funcs - - # Top level commands - _cmds="list list-subsys id-ctrl id-ns \ -@@ -939,7 +942,7 @@ plugin_micron_opts () { - return 0 - } - --lugin_seagate_opts () { -+plugin_seagate_opts () { - local opts="" - local compargs="" - diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml index f9624e33a203..37ce8bf89548 100644 --- a/sys-apps/nvme-cli/metadata.xml +++ b/sys-apps/nvme-cli/metadata.xml @@ -11,6 +11,5 @@ <use> <flag name="json">Support JSON output via <pkg>dev-libs/json-c</pkg></flag> <flag name="hugepages">Use huge pages for memory allocations via <pkg>sys-libs/libhugetlbfs</pkg></flag> - <flag name="uuid">UUID support via <pkg>sys-apps/util-linux</pkg></flag> </use> </pkgmetadata> diff --git a/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild deleted file mode 100644 index d1507396d8fd..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-1.16-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit systemd toolchain-funcs udev - -DESCRIPTION="NVM-Express user space tooling for Linux" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="test" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64 ppc64 ~riscv x86" -IUSE="hugepages +json systemd +uuid" - -RDEPEND="json? ( dev-libs/json-c:= ) - hugepages? ( sys-libs/libhugetlbfs ) - systemd? ( sys-apps/systemd:= ) - uuid? ( sys-apps/util-linux:= )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-musl-limits.patch - "${FILESDIR}"/${P}-bash-completions.patch # Gentoo bug #852764 -) - -src_prepare() { - default - - sed -e 's|^LIBUUID =|LIBUUID ?=|' \ - -e 's|^LIBJSONC =|LIBJSONC ?=|' \ - -e 's|^LIBHUGETLBFS =|LIBHUGETLBFS ?=|' \ - -e 's|^HAVE_SYSTEMD =|HAVE_SYSTEMD ?=|' \ - -e '/DESTDIROLD/d' \ - -i Makefile || die -} - -src_configure() { - tc-export CC - - export PREFIX="${EPREFIX}/usr" - - local unitdir="$(systemd_get_systemunitdir)" - export SYSTEMDDIR="${unitdir%/system}" - export UDEVDIR="${EPREFIX}$(get_udevdir)" - - MAKEOPTS+=" LIBUUID=$(usex uuid 0 1)" - MAKEOPTS+=" LIBJSONC=$(usex json 0 1)" - MAKEOPTS+=" LIBHUGETLBFS=$(usex hugepages 0 1)" - MAKEOPTS+=" HAVE_SYSTEMD=$(usex systemd 0 1)" - MAKEOPTS+=" V=1" -} diff --git a/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild deleted file mode 100644 index 3bce0f7121ce..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson systemd udev - -DESCRIPTION="NVM-Express user space tooling for Linux" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="test" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="hugepages +json +uuid" - -RDEPEND=" - sys-libs/libnvme:=[json=,uuid=] - hugepages? ( sys-libs/libhugetlbfs:= ) - json? ( dev-libs/json-c:= ) - uuid? ( sys-apps/util-linux:= )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-bash-completions.patch # Gentoo bug #852764 -) - -src_configure() { - local unitdir="$(systemd_get_systemunitdir)" - local emesonargs=( - -Dsystemddir=${unitdir%/system} - -Dudevrulesdir="${EPREFIX}"$(get_udevdir) - ) - meson_src_configure -} diff --git a/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild b/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild deleted file mode 100644 index ef7cb9b54e90..000000000000 --- a/sys-apps/nvme-cli/nvme-cli-2.1.2.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson systemd udev - -DESCRIPTION="NVM-Express user space tooling for Linux" -HOMEPAGE="https://github.com/linux-nvme/nvme-cli" -SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.tar.gz" -RESTRICT="test" - -LICENSE="GPL-2 GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="hugepages +json +uuid" - -RDEPEND=" - >=sys-libs/libnvme-1.1:=[json=,uuid=] - hugepages? ( sys-libs/libhugetlbfs:= ) - json? ( dev-libs/json-c:= ) - uuid? ( sys-apps/util-linux:= )" - -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -src_configure() { - local unitdir="$(systemd_get_systemunitdir)" - local emesonargs=( - -Dsystemddir="${unitdir%/system}" - -Dudevrulesdir="${EPREFIX}$(get_udevdir)" - ) - meson_src_configure -} |