mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

multipath-tools: Fix build with json-c 0.14 and newer

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2020-06-03 16:06:56 -07:00
parent c13b51f12b
commit 1b0ce2ce1d
2 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
+42
View File
@@ -0,0 +1,42 @@
From 5ae81386a8cfea4180738c261cd3f7944a631199 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 3 Jun 2020 16:03:56 -0700
Subject: [PATCH] fix boolean value with json-c 0.14
Patch from Christian Hesse posted here
https://www.spinics.net/lists/dm-devel/msg40646.html
Upstream json-c 0.14+ removed the TRUE and FALSE defines in commit
0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
Upstream-Status: Submitted [https://www.spinics.net/lists/dm-devel/msg40646.html]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
libdmmp/libdmmp_private.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
index ac85b63f..29400826 100644
--- a/libdmmp/libdmmp_private.h
+++ b/libdmmp/libdmmp_private.h
@@ -82,7 +82,7 @@ static out_type func_name(struct dmmp_context *ctx, const char *var_name) { \
do { \
json_type j_type = json_type_null; \
json_object *j_obj_tmp = NULL; \
- if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != TRUE) { \
+ if (json_object_object_get_ex(j_obj, key, &j_obj_tmp) != 1) { \
_error(ctx, "Invalid JSON output from multipathd IPC: " \
"key '%s' not found", key); \
rc = DMMP_ERR_IPC_ERROR; \
@@ -90,7 +90,7 @@ do { \
} \
if (j_obj_tmp == NULL) { \
_error(ctx, "BUG: Got NULL j_obj_tmp from " \
- "json_object_object_get_ex() while it return TRUE"); \
+ "json_object_object_get_ex() while it return 1"); \
rc = DMMP_ERR_BUG; \
goto out; \
} \
--
2.27.0
meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
+1
View File
@@ -45,6 +45,7 @@ SRC_URI = "git://git.opensvc.com/multipath-tools/.git;protocol=http \
file://0031-Always-use-devmapper-for-kpartx.patch \
file://0001-fix-bug-of-do_compile-and-do_install.patch \
file://0001-add-explicit-dependency-on-libraries.patch \
file://0001-fix-boolean-value-with-json-c-0.14.patch \
"
LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"