diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-13 00:08:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-13 00:08:30 +0100 |
| commit | 0ebcd2cbf178600b5eb36b2f24cdbb3d2f4a9000 (patch) | |
| tree | 941e6ba8c256dd27e9f9ca634f08d4bf0278798e /sys-apps/nvme-cli | |
| parent | f0ddcad13515f66d2f3bf827d33c277bdba7e1dd (diff) | |
gentoo auto-resync : 13:06:2024 - 00:08:29
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-2.9.1-musl.patch | 28 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild | 1 |
3 files changed, 31 insertions, 1 deletions
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index 8e9d0ff55aa7..925c3e20df54 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1,8 +1,9 @@ AUX nvme-cli-2.9.1-musl-stdint.patch 3329 BLAKE2B aabe7e8dc991f810359cc1e626ec2ec786bbe595f833e43d4304a4a8109602b3469c2e9d0e4f7d571f7fac8b7c48818630ba8ec639949b0e84f78e746d6b3f96 SHA512 1bc88e0215686488d243a5b950d29d9e6ca2390165d5e72dc7c31e45222df6e1967b772e8bb89ad9c12fb3f43b9d08d21f64a00a28a1b79d0d768bd948c35cde +AUX nvme-cli-2.9.1-musl.patch 992 BLAKE2B d3fa0fdc4d33be272a10100304737350acf19ac4df3ddb8674aeb7fa82f013b14445594631cb8f67ca64eed50e77dbafbf26b229afe9c19a465ac3e066516e6d SHA512 1c14b725927f9fd69274c0eb666c15022a4ccf88aa16650e754fb0ec350ca3939ea5ccdc04ca4010049d5d38dbecd305d909ccc9aa834acd2ab82143cca22730 DIST nvme-cli-2.7.1.gh.tar.gz 902081 BLAKE2B 7d14838f7f0fd6d1ab1cb30041f862fe2db6f40fe72c13cb4ce227831cac6e141ff5cec2924c846f30629188754b0ce0630ad9009d2a490c193da20e8b8a45d1 SHA512 6a9f3574dfd4375e6f7a76ed95f698efb26da5b72a490579caeba9d46c4811ae31650844e0a0e1047dc627158d5ffbdc020112a5059d3195e7eadff902b70b19 DIST nvme-cli-2.8.gh.tar.gz 910994 BLAKE2B c231fc087219622736bdc400c83d2a320670f247f77b53f0cad20c8117e620703badba7cd9a6f267ba79223be9c0d6710c2be968683f77fe72e45957e0c8b899 SHA512 1be0bed4e1bf8a25229f301c2b00b78d2de4eaf8ff2b815fa75e44dd35ddd7787604152bdf00696130df3281206a734c5f408c3f2127440e05c2e4b1cdbb79d4 DIST nvme-cli-2.9.1.gh.tar.gz 932210 BLAKE2B 865808c17f2098f8d0be8ba928869801023f77f0ffd44b5d2424b9f75e01180f8d1990684e3e4a79363e650a44e58abe213b5ab55328f0bde9ed699eba9a215c SHA512 c9c86e7567c2d4c59aff1eb9d18f4775923db3c81a89c628b819121c32150d4bc2d65d0dacac764c64594369890b380d0fd06bc7c1f83f4a7f3e71a51a6fee24 EBUILD nvme-cli-2.7.1.ebuild 926 BLAKE2B ffdaa6599c97b85a07f8e08e51c06d74157bfeff083c034bb93c023406689216e715537bfb8a47b289982a5ec1d83a5f273c4a903bed38207dfc43514a34c7da SHA512 48f4e66972e0594775f735e0dcc6900e009361ec03f06200e288922262f4a63e57e98cddc7bff820172f7fc9b02015dead97ec10f2479934be5dc4b61594b726 EBUILD nvme-cli-2.8.ebuild 947 BLAKE2B 51bfcee2f89a93e4fc1a7d280639442dba7af56bc67fc7cfa9af2a89b5ec7e4f6170e28ab3508f72d9d344cccd2141562b7361a5db949ece50039b275cce246d SHA512 3df063c969ae6b0301e60acc4fd75f6cd0ffa13d296f0defacd1333ab99562d5bd92095104bdb11ef4dc35d859147d66260b87a429c77f1d11f034da01824191 -EBUILD nvme-cli-2.9.1.ebuild 1008 BLAKE2B 8d8cdc3bd6389dbf1a2c06d9c1c00e72758fe9e3f624dbc73f1191c710a92b51b8e5a4e31a5a31497cad32d3c25e4b589ccf2886a8ce6a125bbcb3771b8f58cc SHA512 32ef09caa4cfb31caa086a4850a412ba9c512e56885a1c19e17d0e49ab3ed0aa09cc932c49f0e2a5061bed50524217b0803eac1a64c9c2e7eb84ef935d615326 +EBUILD nvme-cli-2.9.1.ebuild 1046 BLAKE2B 5fe657a5bcd85671e25278a98e466000b8c4bdc7e24023822c97be010211e6b82a17d36ea7dc67a01ff25b627cec7e636ed10d833c74b4938252c16d6bc8dc3f SHA512 e84ebe4e8e598a19e907fe787e038a759cc1c8e9eea2714bf46abe5e221b9925bf6afb6542ee52d81d2834e5b2d551234695e7b0d2cf37fbd186a27fbc0b8fee MISC metadata.xml 435 BLAKE2B 6756d3cbc2fa183946f5cb5fe2e6cc3e19ffef2a63f6c5ba6cf203bbcc6eb0df68d615b8ad266dc89ce23cd06a5d843bddeae8eaf574bf45ad1c06442f50c9c5 SHA512 2b05f8e31378564378339755d80da4244524c8f261fc0fda47a1350bf5a6309b5cca68c74bad06566d6f2bf9e1cc1747b7ce2ebf783c46a9015d27fdcff44b7d diff --git a/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch b/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch new file mode 100644 index 000000000000..de7b488cc25d --- /dev/null +++ b/sys-apps/nvme-cli/files/nvme-cli-2.9.1-musl.patch @@ -0,0 +1,28 @@ +https://bugs.gentoo.org/934081 +https://github.com/linux-nvme/nvme-cli/commit/650070ad5d4a97fc87f9018743e3b566deba36c8 + +From 650070ad5d4a97fc87f9018743e3b566deba36c8 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 21 May 2024 14:09:32 -0700 +Subject: [PATCH] plugins/ssstc: Replace __uint16_t with uint16_t + +uint16_t is ISO defined and comes from stdint.h, makes it +portable across glibc and musl on linux. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/plugins/ssstc/ssstc-nvme.c ++++ b/plugins/ssstc/ssstc-nvme.c +@@ -64,9 +64,9 @@ void show_ssstc_add_smart_log_jsn(struct nvme_additional_smart_log *smart, + unsigned int nsid, const char *devname) + { + struct json_object *root, *entry_stats, *dev_stats, *multi; +- __uint16_t wear_level_min = 0; +- __uint16_t wear_level_max = 0; +- __uint16_t wear_level_avg = 0; ++ uint16_t wear_level_min = 0; ++ uint16_t wear_level_max = 0; ++ uint16_t wear_level_avg = 0; + uint64_t raw_val = 0; + + root = json_create_object(); + 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 ead3edbdb1f6..991abb4ea462 100644 --- a/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild +++ b/sys-apps/nvme-cli/nvme-cli-2.9.1.ebuild @@ -29,6 +29,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.9.1-musl-stdint.patch + "${FILESDIR}"/${PN}-2.9.1-musl.patch ) src_configure() { |