diff mbox series

[meta-oe,2/2] nvme-cli: Update to 1.12

Message ID 20250408041523.4029757-2-alistair.francis@wdc.com
State New
Headers show
Series [meta-oe,1/2] libnvme: Update to 1.12 | expand

Commit Message

Alistair Francis April 8, 2025, 4:15 a.m. UTC 
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 ...allback-for-non-standard-locale-cate.patch | 39 -------------------
 ...dd-include-of-libgen.h-for-basename-.patch | 34 ----------------
 .../{nvme-cli_2.11.bb => nvme-cli_2.12.bb}    |  7 +---
 3 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-print-add-fallback-for-non-standard-locale-cate.patch
 delete mode 100644 meta-oe/recipes-bsp/nvme-cli/nvme-cli/0002-plugins-netapp-add-include-of-libgen.h-for-basename-.patch
 rename meta-oe/recipes-bsp/nvme-cli/{nvme-cli_2.11.bb => nvme-cli_2.12.bb} (85%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-print-add-fallback-for-non-standard-locale-cate.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-print-add-fallback-for-non-standard-locale-cate.patch
deleted file mode 100644
index 981acb1b81..0000000000
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-print-add-fallback-for-non-standard-locale-cate.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-From 9444ce03a27b8d423f8170cf75f56d48d8a0a659 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+commits@rb67.eu>
-Date: Mon, 11 Nov 2024 23:06:03 +0100
-Subject: [PATCH] nvme-print: add fallback for non-standard locale category
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-LC_MEASUREMENT is a GNU (libc) extension - fall back to LC_ALL if it's
-not defined.
-
-Fixes build with musl libc
-
-Signed-off-by: Daniel Néri <dne+commits@rb67.eu>
-
-Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/9444ce03a27b8d423f8170cf75f56d48d8a0a659]
-Signed-off-by: Ryosuke Saito <ryosuke.saito@linaro.org>
----
- nvme-print.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/nvme-print.c b/nvme-print.c
-index 170e5c12fb22..5b1f2e827aef 100644
---- a/nvme-print.c
-+++ b/nvme-print.c
-@@ -797,6 +797,10 @@ static bool is_fahrenheit_country(const char *country)
- 	return false;
- }
- 
-+#ifndef LC_MEASUREMENT
-+#define LC_MEASUREMENT LC_ALL
-+#endif
-+
- static bool is_temperature_fahrenheit(void)
- {
- 	const char *locale, *underscore;
--- 
-2.47.0
-
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0002-plugins-netapp-add-include-of-libgen.h-for-basename-.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0002-plugins-netapp-add-include-of-libgen.h-for-basename-.patch
deleted file mode 100644
index 42ca7f5340..0000000000
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0002-plugins-netapp-add-include-of-libgen.h-for-basename-.patch
+++ /dev/null
@@ -1,34 +0,0 @@ 
-From ac4818952c872ba465a2d0f48634f9a79aae064f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20N=C3=A9ri?= <dne+commits@rb67.eu>
-Date: Mon, 11 Nov 2024 22:34:57 +0100
-Subject: [PATCH] plugins/netapp: add include of libgen.h for basename(3)
- prototype
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes build with musl libc.
-
-Signed-off-by: Daniel Néri <dne+commits@rb67.eu>
-
-Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/ac4818952c872ba465a2d0f48634f9a79aae064f]
-Signed-off-by: Ryosuke Saito <ryosuke.saito@linaro.org>
----
- plugins/netapp/netapp-nvme.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/netapp/netapp-nvme.c b/plugins/netapp/netapp-nvme.c
-index 5c2e3d4989b8..9f05ffc5d97e 100644
---- a/plugins/netapp/netapp-nvme.c
-+++ b/plugins/netapp/netapp-nvme.c
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <errno.h>
- #include <string.h>
-+#include <libgen.h>
- 
- #include "common.h"
- #include "nvme.h"
--- 
-2.47.0
-
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.11.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb
similarity index 85%
rename from meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.11.bb
rename to meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb
index 7c030cd847..7ab244f3cc 100644
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.11.bb
+++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.12.bb
@@ -6,12 +6,9 @@  LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \
                     file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \
                     file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2"
 DEPENDS = "json-c libnvme"
-SRCREV = "9f34fcb12e3ab098e9b30e0f31e92cefb497cc42"
-
-SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https \
-           file://0001-nvme-print-add-fallback-for-non-standard-locale-cate.patch \
-           file://0002-plugins-netapp-add-include-of-libgen.h-for-basename-.patch"
+SRCREV = "71fa5d9310d6b41a69e844593423ac91b1453472"
 
+SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https"
 S = "${WORKDIR}/git"
 
 inherit bash-completion meson pkgconfig systemd