diff options
-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 @@ | |||
1 | From 0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f Mon Sep 17 00:00:00 2001 | ||
2 | From: Neel Chotai <neel@chot.ai> | ||
3 | Date: Fri, 14 Feb 2020 17:56:23 +0000 | ||
4 | Subject: [PATCH] fix musl compilation | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/0ff7ad2c88e3a47e7e3f6fe68c28a8d2d8a71f1f] | ||
7 | Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io> | ||
8 | --- | ||
9 | plugins/micron/micron-nvme.c | 1 + | ||
10 | 1 file changed, 1 insertion(+) | ||
11 | |||
12 | diff --git a/plugins/micron/micron-nvme.c b/plugins/micron/micron-nvme.c | ||
13 | index 8240887..165fcf0 100644 | ||
14 | --- a/plugins/micron/micron-nvme.c | ||
15 | +++ b/plugins/micron/micron-nvme.c | ||
16 | @@ -13,6 +13,7 @@ | ||
17 | #include "nvme-print.h" | ||
18 | #include "nvme-ioctl.h" | ||
19 | #include <sys/ioctl.h> | ||
20 | +#include <limits.h> | ||
21 | |||
22 | #define CREATE_CMD | ||
23 | #include "micron-nvme.h" | ||
24 | -- | ||
25 | 2.7.4 | ||
26 | |||
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" | |||
7 | DEPENDS = "util-linux" | 7 | DEPENDS = "util-linux" |
8 | PV .= "+git${SRCPV}" | 8 | PV .= "+git${SRCPV}" |
9 | 9 | ||
10 | SRC_URI = "git://github.com/linux-nvme/nvme-cli.git" | 10 | SRC_URI = "git://github.com/linux-nvme/nvme-cli.git \ |
11 | SRCREV = "977e7d4cf59c3c7f89e9c093c91f991b07292e45" | 11 | file://0001-fix-musl-compilation.patch \ |
12 | " | ||
13 | SRCREV = "1d84d6ae0c7d7ceff5a73fe174dde8b0005f6108" | ||
12 | 14 | ||
13 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
14 | 16 | ||