sys-apps/nvme-cli: Sync with Gentoo

It's from Gentoo commit 934965b58016e79fa4d6646bae7f56066a8d700c.
2026-05-07 21:26:35 +02:00 · 2023-05-16 11:44:28 +05:30 · 2023-05-16 11:44:28 +05:30 · 08619d3bd6
commit 08619d3bd6
parent 74b7b6a867
13 changed files with 227 additions and 190 deletions
--- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
+++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords
@ -45,3 +45,4 @@
 =sys-libs/liburing-2.1-r2 ~amd64 ~arm64

 =app-crypt/adcli-0.9.2 ~amd64 ~arm64
+=sys-apps/nvme-cli-2.4-r2 ~amd64 ~arm64
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/Manifest
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/Manifest
@ -1,3 +1,3 @@
-DIST nvme-cli-1.14.tar.gz 579561 BLAKE2B e27dade228ee47d88ef5cbab4d9d6163e75af44fb3345ed2ae566e875b973355255a5aba1b1846e53006f9676922cf7901a5e6e4867fcf04c591bf372a119bca SHA512 b5e18708233fd37069d84ee34232d737ed6d6909b0ec523d82cc2c4940172f7ce769b9bbec0d8615ebee544a5174cb4d752ad6d96ea05cfaa1177efc760f0e9e
-DIST nvme-cli-1.15.tar.gz 610927 BLAKE2B 66278904d49987d92083c1bb28a98d362adee8e85ee92e44e9dee381f3efcc76ac53ddf82957495ac7b2ef82e717c570d55e1b2052224740c1bc7e5af8af137e SHA512 0614105153edf7217d4c428927423628b63f6bee034c59926370a13d433c9c3af217338fb6fe2f8bbf781fc17ebae0102e8c072371b7ea4324c18dfdffd40305
-DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff
+DIST nvme-cli-2.2.1.gh.tar.gz 706199 BLAKE2B e0026fc2ee3edeffa18b0fc8365703e3de6f69cdd665878e8589fefa334ddb78f3fdf2768bd5a141dc27b0a7403d0fd7472db763e7e41b55a3cac314105faac3 SHA512 8efa94d49a4d443cdb0310386733e88117f17719b05044f11e63e2a09143fce55918171b457a467371263ebb2e36552558aad249ae4dbd27941af79fe9722e26
+DIST nvme-cli-2.3.gh.tar.gz 733161 BLAKE2B b6da650379f24e0dc5c41af3d09fe15076ed70ad39cf48060fd949e3a4bbfe896eef4dd42e27314fab695710c9cb04985f3444e0384b71794cfbf489aa3e6244 SHA512 9ef654e782ba737d3858fb11f24caf27aea820480179d07d32599731be204e52693062cdb86786ab5cdd1d94fe32ae9028baa0a58693d2eaee5a2b71155e3db2
+DIST nvme-cli-2.4.gh.tar.gz 746955 BLAKE2B 7ca26f957bf6927f7af17ac18267cb1099d63ce0f19b085a412b3a1b343946311edf8c5d5924444b7c7d440fbf42597ee7b9717bf9f5dcdeed0a9a17f135d343 SHA512 155667a0b91e15267e3f991a30cf1d4ae26cb4c53b20c002e3d3341496dd463397e1afbfefcd7a8df88370d28417940ce44a060bda87c04482bbe3be4e901b73
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch
@ -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>
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch
@ -0,0 +1,13 @@
+diff --git a/Documentation/meson.build b/Documentation/meson.build
+index bb0c9724..519c4bfc 100644
+--- a/Documentation/meson.build
+++ b/Documentation/meson.build
+@@ -187,7 +187,7 @@ want_docs = get_option('docs')
+ want_docs_build = get_option('docs-build')
+ if want_docs != 'false'
+   mandir = join_paths(get_option('mandir'), 'man1')
+-  htmldir = join_paths(get_option('htmldir'), 'nvme')
+  htmldir = get_option('htmldir')
+ 
+   asciidoctor = find_program('asciidoc', required: get_option('docs-build'))
+   if want_docs_build and asciidoctor.found()
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch
@ -0,0 +1,25 @@
+diff --git a/meson.build b/meson.build
+index c05dc47f..4ae7c513 100644
+--- a/meson.build
+++ b/meson.build
+@@ -64,9 +64,9 @@ libz_dep = dependency('zlib', required: true,
+                       fallback : ['zlib', 'zlib_dep'])
+ 
+ # Check for libhugetlbfs availability (optional)
+-if cc.has_header('hugetlbfs.h')
+if get_option('hugepages') and cc.has_header('hugetlbfs.h')
+   libhugetlbfs_dep = cc.find_library('hugetlbfs',
+-                                     required : false)
+                                     required : true)
+   have_libhugetlbfs = libhugetlbfs_dep.found()
+ else
+   libhugetlbfs_dep = []
+diff --git a/meson_options.txt b/meson_options.txt
+index 04843ea5..bb10b6c0 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -9,3 +9,4 @@ option('nvme-tests', type : 'boolean', value : false, description: 'Run tests ag
+ option('docs', type : 'combo', choices : ['false', 'html', 'man', 'all'], description : 'install documentation')
+ option('docs-build', type : 'boolean', value : false, description : 'build documentation')
+ option('pdc-enabled', type: 'boolean', value : false, description : 'set default Persistent Discovery Controllers behavior')
+option('hugepages', type: 'boolean', value : false, description : 'Enable support for hugetlbfs')
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch
@ -0,0 +1,25 @@
+diff --git a/meson.build b/meson.build
+index 24fa16e2..fc3ef0d7 100644
+--- a/meson.build
+++ b/meson.build
+@@ -66,9 +66,9 @@ endif
+ conf.set('CONFIG_JSONC', json_c_dep.found(), description: 'Is json-c available?')
+ 
+ # Check for libhugetlbfs availability (optional)
+-if cc.has_header('hugetlbfs.h')
+if get_option('hugepages') and cc.has_header('hugetlbfs.h')
+   libhugetlbfs_dep = cc.find_library('hugetlbfs',
+-                                     required : false)
+                                     required : true)
+   have_libhugetlbfs = libhugetlbfs_dep.found()
+ else
+   libhugetlbfs_dep = []
+diff --git a/meson_options.txt b/meson_options.txt
+index 677942ae..752ecd40 100644
+--- a/meson_options.txt
+++ b/meson_options.txt
+@@ -10,3 +10,4 @@ option('docs', type : 'combo', choices : ['false', 'html', 'man', 'all'], descri
+ option('docs-build', type : 'boolean', value : false, description : 'build documentation')
+ option('pdc-enabled', type: 'boolean', value : false, description : 'set default Persistent Discovery Controllers behavior')
+ option('json-c', type: 'feature', value: 'auto', description: 'JSON suppport')
+option('hugepages', type: 'boolean', value : false, description : 'Enable support for hugetlbfs')
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/metadata.xml
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/metadata.xml
@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>zmedico@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">linux-nvme/nvme-cli</remote-id>
-  </upstream>
-  <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>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">linux-nvme/nvme-cli</remote-id>
+	</upstream>
+	<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>
+	</use>
 </pkgmetadata>
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.14.ebuild
@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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="+uuid"
-
-RDEPEND="uuid? ( sys-apps/util-linux:= )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -e 's|^LIBUUID =|LIBUUID ?=|' \
-		-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)"
-}
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.15-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.15-r1.ebuild
@ -1,50 +0,0 @@
-# Copyright 1999-2021 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"
-
-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"
-}
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.16.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.16.ebuild
@ -1,54 +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
-)
-
-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"
-}
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild
@ -0,0 +1,48 @@
+# Copyright 1999-2023 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}.gh.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
+IUSE="hugepages +json"
+
+RDEPEND="
+	>=sys-libs/libnvme-1.2:=[json(+)=]
+	hugepages? ( sys-libs/libhugetlbfs:= )
+	json? ( dev-libs/json-c:= )
+	sys-libs/zlib:=
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/nvme-cli-2.2-docdir.patch"
+)
+
+src_configure() {
+	local unitdir="$(systemd_get_systemunitdir)"
+	local emesonargs=(
+		-Ddocs=all
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
+		-Dsystemddir="${unitdir%/system}"
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+}
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.3.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2023 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}.gh.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~loong ppc64 ~riscv ~x86"
+IUSE="hugepages"
+
+RDEPEND="
+	>=sys-libs/libnvme-1.3:=
+	hugepages? ( sys-libs/libhugetlbfs:= )
+	dev-libs/json-c:=
+	sys-libs/zlib:=
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/nvme-cli-2.2-docdir.patch"
+	"${FILESDIR}/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch"
+)
+
+src_configure() {
+	local unitdir="$(systemd_get_systemunitdir)"
+	local emesonargs=(
+		-Ddocs=all
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
+		-Dsystemddir="${unitdir%/system}"
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)"
+		$(meson_use hugepages)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+}
--- a/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild
@ -0,0 +1,51 @@
+# Copyright 1999-2023 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}.gh.tar.gz"
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
+IUSE="hugepages +json"
+
+RDEPEND="
+	=sys-libs/libnvme-1.4*:=[json?]
+	hugepages? ( sys-libs/libhugetlbfs:= )
+	json? ( dev-libs/json-c:= )
+	sys-libs/zlib:=
+"
+
+DEPEND="
+	${RDEPEND}
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/nvme-cli-2.2-docdir.patch"
+	"${FILESDIR}/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch"
+)
+
+src_configure() {
+	local emesonargs=(
+		-Dversion-tag="${PV}"
+		-Ddocs=all
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		-Dsystemddir="$(systemd_get_systemunitdir)"
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+		$(meson_use hugepages)
+		$(meson_feature json json-c)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+}