diff options
| author |   Pierre-Jean Texier <pjtexier@koncepto.io> | 2020-03-19 20:49:59 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2020-03-20 07:44:29 -0700 |
| commit | e4a1287bf181483a95d10e0074c894c86a4620d3 (patch) | |
| tree | 98f466e64477ac827a9956fa555499db3dca0e33 /meta-oe/recipes-bsp | |
| parent | fa91738a942756582d7fd2bfd5a9a72abde65f6e (diff) | |
| download | meta-openembedded-e4a1287bf181483a95d10e0074c894c86a4620d3.tar.gz | |
nvme-cli: upgrade 1.9 -> 1.10.1
Also backport a patch to fix a build failure
with the mucl libc.
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-bsp')
| -rw-r--r-- | meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch | 26 | ||||
| -rw-r--r-- | meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb (renamed from meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb) | 6 |
2 files changed, 30 insertions, 2 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 new file mode 100644 index 0000000000..be5d0dac79 --- /dev/null +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-fix-musl-compilation.patch @@ -0,0 +1,26 @@ +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.9.bb b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb index ea8bc1738e..4f4bb2dfab 100644 --- a/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.9.bb +++ b/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.10.1.bb @@ -7,8 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" DEPENDS = "util-linux" PV .= "+git${SRCPV}" -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" -SRCREV = "977e7d4cf59c3c7f89e9c093c91f991b07292e45" +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ + file://0001-fix-musl-compilation.patch \ +" +SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108" S = "${WORKDIR}/git" |