mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-30 10:01:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-apps/nvme-cli: Sync with gentoo

Browse Source 
It's from gentoo commit 6715288e1cf340a1a156d41e12693a7a8356c44e.
This commit is contained in:
Krzesimir Nowak 2022-02-17 08:09:43 +01:00
parent 7121e90d25
commit 19770b6891
9 changed files with 185 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,3 @@
DIST nvme-cli-0.9.tar.gz 167565 SHA256 6b47087cba2ea3f0d53ed9316dc7a13d9a2ad618abaeeda23d7f520035a62b3c SHA512 ea9481b77aac14db60e75fb885360c91e548c61d2beacd3c0abf53acc080a9a0418c742f483b906a458109e1c4f226e7213ebba27e5bbdaee3a54222f03be71e WHIRLPOOL 8909194139634495f31ee286509f3da64ac4debe468731983339c4599111f1366a8846426918903c923e5020f4eb6af72569bef31e2024e9e8fb2c8daa85001c
DIST nvme-cli-1.0.tar.gz 191617 SHA256 1391bac6b8e1acf4f91c0b8b60d1055b142e7d3d041ea9799fc157517897439c SHA512 4aa7c33a966c25da36aaf17fdb0994fa3e6d3d20d59d444903d8269933565ed0b51941b27143a1533b8dfa307d21240eefa620ed041fcf38342d9d14298d5ad8 WHIRLPOOL 23289e4b5096ff69e06a7757b4e121e7490a016d636aaecc5fd671af90f9f0863c83637341d868d774f175b33e368efa5ca427d549ed10e04f6eab35ae797ac5
DIST nvme-cli-1.1.tar.gz 207679 SHA256 22883719cbab86d52e8d4755e86ebd70476416e87442385a79b31c981bd60de1 SHA512 339da4385c5e8659a8f3c2e11afadf437d9cdf02c294674e5cc569cd817174c8ccbd4fc8858ce6f5b8f63ccba68790b2140fc87fdf33b7d394b67999ac4afad0 WHIRLPOOL ae1225f7fad83cf2a8a00365cefdcccb251ad4779dd1194accfa4b0e38c4d2460723e4f7843a7cfe04fd2978f9ec507d14cdff8448f3860349eab578fb5d4b82
EBUILD nvme-cli-0.9.ebuild 754 SHA256 696474d3306b77e592981f2f7563214f69b802c1cb35a652a1a0723600e4ffe3 SHA512 fcb3922be98046262920ab876809b9a55ba8d96e98a2129f9324b956598663b667f2b32a5bd9808331c051e9303262da4969a51237dd86291043bc1da4474796 WHIRLPOOL bbbef03661a3803457ba2dc91edd0b560f63c71f570da272449e7fc81c0f0c88bd50969fb2e78e64245c8000ed7ee8c1af98cf3d93e423d44bd386424300884d
EBUILD nvme-cli-1.0.ebuild 754 SHA256 696474d3306b77e592981f2f7563214f69b802c1cb35a652a1a0723600e4ffe3 SHA512 fcb3922be98046262920ab876809b9a55ba8d96e98a2129f9324b956598663b667f2b32a5bd9808331c051e9303262da4969a51237dd86291043bc1da4474796 WHIRLPOOL bbbef03661a3803457ba2dc91edd0b560f63c71f570da272449e7fc81c0f0c88bd50969fb2e78e64245c8000ed7ee8c1af98cf3d93e423d44bd386424300884d
EBUILD nvme-cli-1.1.ebuild 579 SHA256 234e2166b933469b282b9430696eb78bcdd78fa96003c26e927d49d7ca472103 SHA512 cfc6f7bd2f6dbc070c604c4e72ca406e29e2e2d240b14559836054039ae71f5f0eda82e808558115e97e4ac19d29d178c9fa584045ecf60458f1dcb743a62358 WHIRLPOOL 66ecc2952cbcabd6e2128afacff19ff80fd232f7d6cabb88e7412445e05effbe3660413ffc1fc6b1ef3a2425203298af2c510f1be21f2d1e08f8d5f747e9da69
MISC ChangeLog 2331 SHA256 4c7f8e43874a05aef1f6924b03567be28384ed6dc5db8bdf34edf828eaf8aa45 SHA512 298e143843dead41c9494bae946b10f4f20f6eff92792832e22c759869be4ac830a0f18a6b299b7fd98d0e9cb8f2a81d70e76a2f8e7d3ec12ee5ea3d178e33d1 WHIRLPOOL 505d854292de48d4b20de7d7b291c94bd8e353eb136238f9fd4c6b02d5444eb0f4f3170389bf926f405e982c501e7a8b61bbac26fc4133e0cd25fe6c9ed55dbc
MISC metadata.xml 310 SHA256 0777b5fc46da6e0ae285ebd0038be86e581a7e2dd69db709587c1233c0964ba5 SHA512 f32474bd2f6daa3306a5bcea0ad742c51142823dd6a14a6bd18c8201016c0182d2e87762c66b95882a42d5ff9083813ff995b0774d615745c2a6666c444bf616 WHIRLPOOL 09d1850437b36400efe105068ad2493f5c56aa6aa728e9c0ef5cd137749592b4f628346b4faf6de5d13b4ea0bc68ec87c9a2380b7f9c33665e4563e2ddcc0ac0
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

37
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch vendored Normal file
View File

@ -0,0 +1,37 @@
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>

7
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/metadata.xml vendored
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
@ -7,4 +7,9 @@
<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>
</pkgmetadata>

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

@ -1,36 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs
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"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="udev"
RDEPEND="sys-libs/libcap
udev? ( virtual/libudev:= )"
DEPEND="${RDEPEND}"
src_prepare() {
sed -i -E \
-e '/^CFLAGS/s: (-O2|-g|-Wall|-Werror)\>: :g' \
Makefile || die
sed -i \
-e '/^PREFIX/s|:=|?=|' \
Documentation/Makefile || die
default
}
src_configure() {
tc-export CC
export PREFIX="${EPREFIX}/usr"
MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)"
}

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

@ -1,36 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs
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"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="udev"
RDEPEND="sys-libs/libcap
udev? ( virtual/libudev:= )"
DEPEND="${RDEPEND}"
src_prepare() {
sed -i -E \
-e '/^CFLAGS/s: (-O2|-g|-Wall|-Werror)\>: :g' \
Makefile || die
sed -i \
-e '/^PREFIX/s|:=|?=|' \
Documentation/Makefile || die
default
}
src_configure() {
tc-export CC
export PREFIX="${EPREFIX}/usr"
MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)"
}

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

@ -1,25 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
inherit toolchain-funcs
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"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="udev"
RDEPEND="sys-libs/libcap:=
udev? ( virtual/libudev:= )"
DEPEND="${RDEPEND}"
src_configure() {
tc-export CC
export PREFIX="${EPREFIX}/usr"
MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)"
}

35
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.14.ebuild vendored Normal file
View File

@ -0,0 +1,35 @@
# 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)"
}

50
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.15-r1.ebuild vendored Normal file
View File

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

54
sdk_container/src/third_party/portage-stable/sys-apps/nvme-cli/nvme-cli-1.16.ebuild vendored Normal file
View File

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