diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2023-11-03 17:19:21 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2023-11-06 08:47:16 -0800 |
| commit | affd76bde2e2756147abd25ff2e6d40def761ce6 (patch) | |
| tree | 2d37d15d99b8c61a585ae1ebadcff11fac900a83 /meta-oe/recipes-extended | |
| parent | 107b6767336ec55650db8bb043b8b196c81b84ec (diff) | |
| download | meta-openembedded-contrib-affd76bde2e2756147abd25ff2e6d40def761ce6.tar.gz | |
pmdk: upgrade 1.12.1 -> 2.0.0
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended')
| -rw-r--r-- | meta-oe/recipes-extended/pmdk/pmdk/0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch | 43 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb (renamed from meta-oe/recipes-extended/pmdk/pmdk_1.12.1.bb) | 5 |
2 files changed, 2 insertions, 46 deletions
diff --git a/meta-oe/recipes-extended/pmdk/pmdk/0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch b/meta-oe/recipes-extended/pmdk/pmdk/0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch deleted file mode 100644 index b16b633a3b..0000000000 --- a/meta-oe/recipes-extended/pmdk/pmdk/0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch +++ /dev/null @@ -1,43 +0,0 @@ -From de6425acaa50426883e85a599001ae5e927aec5b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 2 Mar 2023 16:23:56 -0800 -Subject: [PATCH] pmempool: Match function prototypes of enum_to_str_fn - function pointer - -This is flagged by clang 16+ -common.c:844:4: error: cast from 'const char *(*)(enum chunk_type)' to 'enum_to_str_fn' (aka 'const char *(*)(int)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] - (enum_to_str_fn)out_get_chunk_type_str); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1 error generated. - -Upstream-Status: Submitted [https://github.com/pmem/pmdk/pull/5543] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/tools/pmempool/common.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/tools/pmempool/common.c b/src/tools/pmempool/common.c -index 5e7e472cc..4b7e9b95f 100644 ---- a/src/tools/pmempool/common.c -+++ b/src/tools/pmempool/common.c -@@ -41,7 +41,7 @@ - - #define REQ_BUFF_SIZE 2048U - #define Q_BUFF_SIZE 8192 --typedef const char *(*enum_to_str_fn)(int); -+typedef const char *(*enum_to_str_fn)(enum chunk_type); - - /* - * pmem_pool_type -- return pool type based on first two pages. -@@ -790,7 +790,7 @@ util_parse_enum(const char *str, int first, int max, uint64_t *bitmap, - enum_to_str_fn enum_to_str) - { - for (int i = first; i < max; i++) { -- if (strcmp(str, enum_to_str(i)) == 0) { -+ if (strcmp(str, enum_to_str((enum chunk_type)i)) == 0) { - *bitmap |= (uint64_t)1<<i; - return 0; - } --- -2.39.2 - diff --git a/meta-oe/recipes-extended/pmdk/pmdk_1.12.1.bb b/meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb index 5261922cdd..aeda236901 100644 --- a/meta-oe/recipes-extended/pmdk/pmdk_1.12.1.bb +++ b/meta-oe/recipes-extended/pmdk/pmdk_2.0.0.bb @@ -11,9 +11,8 @@ DEPENDS:append:libc-musl = " fts" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/pmem/pmdk.git;branch=stable-1.12;protocol=https \ - file://0001-pmempool-Match-function-prototypes-of-enum_to_str_fn.patch" -SRCREV = "786098a024c6fe60e746f2cb1041bcfcd21386c9" +SRC_URI = "git://github.com/pmem/pmdk.git;branch=master;protocol=https" +SRCREV = "ba92d6b469d52d16f26279bebaf317bbdbb3822c" inherit autotools-brokensep pkgconfig |