diff --git a/meta-oe/recipes-extended/pmdk/pmdk/0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch b/meta-oe/recipes-extended/pmdk/pmdk/0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch new file mode 100644 index 0000000000..0b03ffdea5 --- /dev/null +++ b/meta-oe/recipes-extended/pmdk/pmdk/0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch @@ -0,0 +1,69 @@ +From 932252c0ba54a51c8bcf58b747656e29cdebfa6a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 26 Mar 2022 13:06:50 -0700 +Subject: [PATCH] use daxctl/libdaxctl.h instead of ndctl/libdaxctl.h + +Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/5413] +Signed-off-by: Khem Raj +--- + src/libpmem2/badblocks_ndctl.c | 2 +- + src/libpmem2/region_namespace_ndctl.c | 2 +- + src/libpmem2/usc_ndctl.c | 2 +- + src/tools/daxio/daxio.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/libpmem2/badblocks_ndctl.c b/src/libpmem2/badblocks_ndctl.c +index 9a5910bba..cc637f7f4 100644 +--- a/src/libpmem2/badblocks_ndctl.c ++++ b/src/libpmem2/badblocks_ndctl.c +@@ -16,7 +16,7 @@ + #include + #include + #include +-#include ++#include + + #include "libpmem2.h" + #include "pmem2_utils.h" +diff --git a/src/libpmem2/region_namespace_ndctl.c b/src/libpmem2/region_namespace_ndctl.c +index 1383796a9..e31185984 100644 +--- a/src/libpmem2/region_namespace_ndctl.c ++++ b/src/libpmem2/region_namespace_ndctl.c +@@ -6,7 +6,7 @@ + */ + + #include +-#include ++#include + #include + #include + +diff --git a/src/libpmem2/usc_ndctl.c b/src/libpmem2/usc_ndctl.c +index be63e879b..c58032a83 100644 +--- a/src/libpmem2/usc_ndctl.c ++++ b/src/libpmem2/usc_ndctl.c +@@ -5,7 +5,7 @@ + * usc_ndctl.c -- pmem2 usc function for platforms using ndctl + */ + #include +-#include ++#include + #include + #include + #include +diff --git a/src/tools/daxio/daxio.c b/src/tools/daxio/daxio.c +index 66cd0b7ae..7f2c89d48 100644 +--- a/src/tools/daxio/daxio.c ++++ b/src/tools/daxio/daxio.c +@@ -21,7 +21,7 @@ + #include + + #include +-#include ++#include + #include + + #include "util.h" +-- +2.35.1 + diff --git a/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb b/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb index 4354c83371..33d04099c9 100644 --- a/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb +++ b/meta-oe/recipes-extended/pmdk/pmdk_1.11.1.bb @@ -11,7 +11,8 @@ DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.11;protocol=https" +SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.11;protocol=https \ + file://0001-use-daxctl-libdaxctl.h-instead-of-ndctl-libdaxctl.h.patch" SRCREV = "5b21904a257eff47f2e87fcbf2de46111f03ddd8" inherit autotools-brokensep pkgconfig