mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-09 14:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/nvme-cli: Sync with Gentoo

Browse Source 
It's from Gentoo commit 0ececa5a70eaa2ada5f3a5422afb1492c96493a4.
This commit is contained in:
Flatcar Buildbot 2024-01-01 07:15:07 +00:00 committed by Krzesimir Nowak
parent c7a657bcef
commit 5adc69eede
9 changed files with 15 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/Manifest vendored
View File

@ -1,5 +1,3 @@
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
DIST nvme-cli-2.5.gh.tar.gz 794528 BLAKE2B 4e569c612d98a369d9ef720b74fbd50e6bd0b425725593bac2c06966d693cb0c86e034d571d24b17c12bce39467973280d440c1fb5cc3dccdb6c0d112507feab SHA512 50c557e86e95b27a0ad57779c33bbb847e12dd45c30e792f5ce1d52dedd4bc704ac25fa0af2fdebd281c9dfe0059f7ed7c1620fccfde9323f6f9a97afdf8c3cb
DIST nvme-cli-2.6.gh.tar.gz 837964 BLAKE2B cd8b0442d58d94d6c402e252e98d81da209fbbd34d3d9eb8d570caedb7e56107d8cb4f9bd774b72eea688fc00678fc24c5f3f8cf46875e6dedadccca3c8e6f68 SHA512 da4daef2d7c554455e0c195c03f92188e0e946409a3bd8a5b421d9a106746e82fb1309901d2893639b1a3447bda094c80a9f49f59bf43cf2b00402f82beea3fc
DIST nvme-cli-2.7.1.gh.tar.gz 902081 BLAKE2B 7d14838f7f0fd6d1ab1cb30041f862fe2db6f40fe72c13cb4ce227831cac6e141ff5cec2924c846f30629188754b0ce0630ad9009d2a490c193da20e8b8a45d1 SHA512 6a9f3574dfd4375e6f7a76ed95f698efb26da5b72a490579caeba9d46c4811ae31650844e0a0e1047dc627158d5ffbdc020112a5059d3195e7eadff902b70b19
DIST nvme-cli-2.7.gh.tar.gz 902149 BLAKE2B 4e9d63f002480f60b76b4c7ca5dfefe0f5c8a1acf37eaeab91d4f0844aa43448b0a79cd906d33a09d6546c0ce5ed17f7a7a104d4f607e0a99c4ebd5b4125b0a3 SHA512 fcdd6598b004287b90b9fdea2948434f288113a9e41b36c2f44731ac51b7acbda9481bf60d0a183b4a8d79b06a1faaf71bd66f47e641d8eb229f1c05c281b2ae

13
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch vendored
View File

@ -1,13 +0,0 @@
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()

25
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch vendored
View File

@ -1,25 +0,0 @@
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')

25
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch vendored
View File

@ -1,25 +0,0 @@
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')

48
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild vendored
View File

@ -1,48 +0,0 @@
# 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
}

50
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.3.ebuild vendored
View File

@ -1,50 +0,0 @@
# 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
}

2
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.6.ebuild vendored
View File

@ -11,7 +11,7 @@ SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh
LICENSE="GPL-2 GPL-2+"
SLOT="0"
KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv ~sparc x86"
IUSE="hugepages +json"
RDEPEND="

13
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.5.ebuild → sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.7.1.ebuild vendored
View File

@ -11,16 +11,14 @@ SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh
LICENSE="GPL-2 GPL-2+"
SLOT="0"
KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
IUSE="hugepages +json"
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
IUSE="+json"
RDEPEND="
=sys-libs/libnvme-1.5*:=[json?]
hugepages? ( sys-libs/libhugetlbfs:= )
>=sys-libs/libnvme-1.7:=[json?]
json? ( dev-libs/json-c:= )
sys-libs/zlib:=
"
DEPEND="
${RDEPEND}
"
@ -28,10 +26,6 @@ BDEPEND="
virtual/pkgconfig
"
PATCHES=(
"${FILESDIR}/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch"
)
src_configure() {
local emesonargs=(
-Dversion-tag="${PV}"
@ -39,7 +33,6 @@ src_configure() {
-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

22
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild → sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-2.7.ebuild vendored
View File

@ -11,16 +11,14 @@ SRC_URI="https://github.com/linux-nvme/nvme-cli/archive/v${PV}.tar.gz -> ${P}.gh
LICENSE="GPL-2 GPL-2+"
SLOT="0"
KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86"
IUSE="hugepages +json"
KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~sparc ~x86"
IUSE="+json"
RDEPEND="
=sys-libs/libnvme-1.4*:=[json?]
hugepages? ( sys-libs/libhugetlbfs:= )
>=sys-libs/libnvme-1.7:=[json?]
json? ( dev-libs/json-c:= )
sys-libs/zlib:=
"
DEPEND="
${RDEPEND}
"
@ -28,11 +26,6 @@ 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}"
@ -40,12 +33,15 @@ src_configure() {
-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
pkg_postinst() {
udev_reload
}
pkg_postrm() {
udev_reload
}