nvme-cli: update to 1.12

Removed patch is included in this version.

Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 2 insertions, 30 deletions

diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch
deleted file mode 100644
index be5d0dac7..000000000
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f Mon Sep 17 00:00:00 2001
-From: Neel Chotai <neel@chot.ai>
-Date: Fri, 14 Feb 2020 17:56:23 +0000
-Subject: [PATCH] fix musl compilation
-
-Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f]
-Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
----
- plugins/micron/micron-nvme.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c
-index 8240887..165fcf0 100644
---- a/plugins/micron/micron-nvme.c
-+++ b/plugins/micron/micron-nvme.c
-@@ -13,6 +13,7 @@
- #include "nvme-print.h"
- #include "nvme-ioctl.h"
- #include <sys/ioctl.h>
-+#include <limits.h>
- 
- #define CREATE_CMD
- #include "micron-nvme.h"
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb
index 4f4bb2dfa..a18b71a7c 100644
--- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb
+++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.12.bb
@@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022"
 DEPENDS = "util-linux"
 PV .= "+git${SRCPV}"
 
-SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \
-           file://0001-fix-musl-compilation.patch \
-"
-SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108"
+SRC_URI = "git://github.com/linux-nvme/nvme-cli.git"
+SRCREV = "949d0aea730136d04af1fb9e0efd4427c20dee6d"
 
 S = "${WORKDIR}/git"