* [gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/, sys-apps/nvme-cli/files/
@ 2023-12-28 4:04 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-12-28 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 0ececa5a70eaa2ada5f3a5422afb1492c96493a4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 03:59:04 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 03:59:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ececa5a
sys-apps/nvme-cli: drop 2.2.1, 2.3, 2.4-r2, 2.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/nvme-cli/Manifest | 4 --
sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch | 13 ------
.../nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch | 25 ----------
.../nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch | 25 ----------
sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild | 48 -------------------
sys-apps/nvme-cli/nvme-cli-2.3.ebuild | 50 --------------------
sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild | 51 --------------------
sys-apps/nvme-cli/nvme-cli-2.5.ebuild | 54 ----------------------
8 files changed, 270 deletions(-)
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 15c815064bbe..84abb1e70a6e 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,7 +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
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch b/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch
deleted file mode 100644
index 92a1c51b11f7..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-2.2-docdir.patch
+++ /dev/null
@@ -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()
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch b/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch
deleted file mode 100644
index e8bba22a92bb..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-2.3-no-hugetlbfs-automatic-dep.patch
+++ /dev/null
@@ -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')
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch b/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch
deleted file mode 100644
index d39f95826aae..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-2.4-no-hugetlbfs-automatic-dep.patch
+++ /dev/null
@@ -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')
diff --git a/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild
deleted file mode 100644
index 2c1223bc049e..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.2.1.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.3.ebuild b/sys-apps/nvme-cli/nvme-cli-2.3.ebuild
deleted file mode 100644
index 64f31939dda6..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.3.ebuild
+++ /dev/null
@@ -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
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild b/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild
deleted file mode 100644
index f873d899c06d..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.4-r2.ebuild
+++ /dev/null
@@ -1,51 +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.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
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.5.ebuild b/sys-apps/nvme-cli/nvme-cli-2.5.ebuild
deleted file mode 100644
index de6c59e4cfa3..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.5.ebuild
+++ /dev/null
@@ -1,54 +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.5*:=[json?]
- hugepages? ( sys-libs/libhugetlbfs:= )
- json? ( dev-libs/json-c:= )
- sys-libs/zlib:=
-"
-
-DEPEND="
- ${RDEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/nvme-cli-2.5-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
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/, sys-apps/nvme-cli/files/
@ 2024-02-06 3:05 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-02-06 3:05 UTC (permalink / raw
To: gentoo-commits
commit: 8d83c2b790640a42929cc92b0cc24675e182b21c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 03:02:14 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 03:02:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d83c2b7
sys-apps/nvme-cli: drop 2.6, 2.7
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/nvme-cli/Manifest | 2 -
.../nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch | 30 ------------
sys-apps/nvme-cli/metadata.xml | 1 -
sys-apps/nvme-cli/nvme-cli-2.6.ebuild | 54 ----------------------
sys-apps/nvme-cli/nvme-cli-2.7.ebuild | 47 -------------------
5 files changed, 134 deletions(-)
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index 84abb1e70a6e..4b98f80e744c 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,3 +1 @@
-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
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch b/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch
deleted file mode 100644
index df32c2c13332..000000000000
--- a/sys-apps/nvme-cli/files/nvme-cli-2.5-no-hugetlbfs-automatic-dep.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/meson.build b/meson.build
-index af79bd4d..90c4d6ad 100644
---- a/meson.build
-+++ b/meson.build
-@@ -69,9 +69,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)
- else
- libhugetlbfs_dep = dependency('', required: false)
- endif
-diff --git a/meson_options.txt b/meson_options.txt
-index c61dae0f..a05a7e0f 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -70,3 +70,9 @@ option(
- type : 'string',
- description : 'override the git version string'
- )
-+option(
-+ 'hugepages',
-+ type: 'boolean',
-+ value : false,
-+ description : 'Enable support for hugetlbfs'
-+)
diff --git a/sys-apps/nvme-cli/metadata.xml b/sys-apps/nvme-cli/metadata.xml
index 37ce8bf89548..727194bfa429 100644
--- a/sys-apps/nvme-cli/metadata.xml
+++ b/sys-apps/nvme-cli/metadata.xml
@@ -10,6 +10,5 @@
</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>
diff --git a/sys-apps/nvme-cli/nvme-cli-2.6.ebuild b/sys-apps/nvme-cli/nvme-cli-2.6.ebuild
deleted file mode 100644
index b5740f1e6b1f..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.6.ebuild
+++ /dev/null
@@ -1,54 +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 ~sparc x86"
-IUSE="hugepages +json"
-
-RDEPEND="
- >=sys-libs/libnvme-1.6:=[json?]
- hugepages? ( sys-libs/libhugetlbfs:= )
- json? ( dev-libs/json-c:= )
- sys-libs/zlib:=
-"
-
-DEPEND="
- ${RDEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}/nvme-cli-2.5-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
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sys-apps/nvme-cli/nvme-cli-2.7.ebuild b/sys-apps/nvme-cli/nvme-cli-2.7.ebuild
deleted file mode 100644
index 0ee6bdafbc3b..000000000000
--- a/sys-apps/nvme-cli/nvme-cli-2.7.ebuild
+++ /dev/null
@@ -1,47 +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 ~sparc ~x86"
-IUSE="+json"
-
-RDEPEND="
- >=sys-libs/libnvme-1.7:=[json?]
- json? ( dev-libs/json-c:= )
- sys-libs/zlib:=
-"
-DEPEND="
- ${RDEPEND}
-"
-BDEPEND="
- virtual/pkgconfig
-"
-
-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_feature json json-c)
- )
- meson_src_configure
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/, sys-apps/nvme-cli/files/
@ 2024-05-04 12:43 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2024-05-04 12:43 UTC (permalink / raw
To: gentoo-commits
commit: 77cafa5b9680f82d40cadd79559f7b642cb8cdf7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 4 12:41:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 4 12:41:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77cafa5b
sys-apps/nvme-cli: fix musl build
Closes: https://bugs.gentoo.org/931194
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/nvme-cli-2.9.1-musl-stdint.patch | 107 +++++++++++++++++++++
sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild | 4 +
2 files changed, 111 insertions(+)
diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl-stdint.patch b/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl-stdint.patch
new file mode 100644
index 000000000000..6ecdac41e3cc
--- /dev/null
+++ b/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl-stdint.patch
@@ -0,0 +1,107 @@
+https://github.com/linux-nvme/nvme-cli/pull/2332
+
+From 61bbd959bc069e4552e50a276b8a0e1487545ec2 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 4 May 2024 09:13:06 +0100
+Subject: [PATCH 1/2] Use C99 types for uint32_t
+
+<stdint.h> provides `uint32_t`, while `u_int_32` is an unofficial/internal
+typedef that glibc happens to provide. This fixes the build on musl.
+
+Bug: https://bugs.gentoo.org/931194
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/nvme.c
++++ b/nvme.c
+@@ -34,6 +34,7 @@
+ #include <inttypes.h>
+ #include <locale.h>
+ #include <stdio.h>
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -9075,8 +9076,8 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru
+
+ unsigned char decoded_key[128];
+ unsigned int decoded_len;
+- u_int32_t crc = crc32(0L, NULL, 0);
+- u_int32_t key_crc;
++ uint32_t crc = crc32(0L, NULL, 0);
++ uint32_t key_crc;
+ int err = 0, hmac;
+ struct config {
+ char *key;
+@@ -9144,10 +9145,10 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru
+ return -EINVAL;
+ }
+ crc = crc32(crc, decoded_key, decoded_len);
+- key_crc = ((u_int32_t)decoded_key[decoded_len]) |
+- ((u_int32_t)decoded_key[decoded_len + 1] << 8) |
+- ((u_int32_t)decoded_key[decoded_len + 2] << 16) |
+- ((u_int32_t)decoded_key[decoded_len + 3] << 24);
++ key_crc = ((uint32_t)decoded_key[decoded_len]) |
++ ((uint32_t)decoded_key[decoded_len + 1] << 8) |
++ ((uint32_t)decoded_key[decoded_len + 2] << 16) |
++ ((uint32_t)decoded_key[decoded_len + 3] << 24);
+ if (key_crc != crc) {
+ nvme_show_error("CRC mismatch (key %08x, crc %08x)", key_crc, crc);
+ return -EINVAL;
+--- a/util/base64.c
++++ b/util/base64.c
+@@ -20,6 +20,7 @@
+ * MA 02110-1301, USA.
+ */
+
++#include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+@@ -42,7 +43,7 @@ static const char base64_table[65] =
+ int base64_encode(const unsigned char *src, int srclen, char *dst)
+ {
+ int i, bits = 0;
+- u_int32_t ac = 0;
++ uint32_t ac = 0;
+ char *cp = dst;
+
+ for (i = 0; i < srclen; i++) {
+@@ -77,7 +78,7 @@ int base64_encode(const unsigned char *src, int srclen, char *dst)
+ */
+ int base64_decode(const char *src, int srclen, unsigned char *dst)
+ {
+- u_int32_t ac = 0;
++ uint32_t ac = 0;
+ int i, bits = 0;
+ unsigned char *bp = dst;
+
+
+From 51208e30da0bfb12340d3a4f3afa0472312a8541 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 4 May 2024 09:15:03 +0100
+Subject: [PATCH 2/2] `u_char` -> `unsigned char`
+
+`u_char` is not a standard name for `unsigned char` and may not work;
+some implementations may provide it for convenience.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/plugins/innogrit/typedef.h
++++ b/plugins/innogrit/typedef.h
+@@ -53,14 +53,14 @@ struct vsc_smart_log {
+ unsigned int low_pwr_cnt;
+ unsigned int wa;
+ unsigned int ps3_entry_cnt;
+- u_char highest_temp[4];
++ unsigned char highest_temp[4];
+ unsigned int weight_ec;
+ unsigned int slc_cap_mb;
+ unsigned long long nand_page_write_cnt;
+ unsigned int program_error_cnt;
+ unsigned int erase_error_cnt;
+- u_char flash_type;
+- u_char reserved2[3];
++ unsigned char flash_type;
++ unsigned char reserved2[3];
+ unsigned int hs_crc_err_cnt;
+ unsigned int ddr_ecc_err_cnt;
+ unsigned int reserved3[44];
+
diff --git a/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild b/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild
index ec7eb940d65c..ead3edbdb1f6 100644
--- a/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild
@@ -27,6 +27,10 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.9.1-musl-stdint.patch
+)
+
src_configure() {
local emesonargs=(
-Dversion-tag="${PV}"
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-04 12:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-28 4:04 [gentoo-commits] repo/gentoo:master commit in: sys-apps/nvme-cli/, sys-apps/nvme-cli/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-02-06 3:05 Sam James
2024-05-04 12:43 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox