All of lore.kernel.org
 help / color / mirror / Atom feed
From: "akuster" <akuster808@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [dunfel 08/32] multipath-tools: Fix build with json-c 0.14 and newer
Date: Tue, 30 Jun 2020 17:06:53 -0700	[thread overview]
Message-ID: <d345970f40c6f9caae869f048c358f598d37e109.1593561840.git.akuster808@gmail.com> (raw)
In-Reply-To: <cover.1593561840.git.akuster808@gmail.com>

From: Khem Raj <raj.khem@gmail.com>

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1b0ce2ce1d388d223ff337e5683d9b026b7082ba)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
 ...1-fix-boolean-value-with-json-c-0.14.patch | 42 +++++++++++++++++++
 .../multipath-tools/multipath-tools_0.8.4.bb  |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch

diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch b/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
new file mode 100644
index 0000000000..cf97b491e1
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-fix-boolean-value-with-json-c-0.14.patch
@@ -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
+
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
index af34a4b392..0d03191373 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.8.4.bb
@@ -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"
-- 
2.17.1


  parent reply	other threads:[~2020-07-01  0:07 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-01  0:06 [dunfel 00/32] Patch review akuster
2020-07-01  0:06 ` [dunfel 01/32] zchunk: upgrade 1.1.5 -> 1.1.6 akuster
2020-07-01  0:06 ` [dunfel 02/32] uriparser: upgrade 0.9.3 -> 0.9.4 akuster
2020-07-01  0:06 ` [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3 akuster
2020-07-09 15:21   ` [oe] " Martin Jansa
2020-07-09 16:06     ` akuster
2020-07-09 16:48       ` Martin Jansa
2020-07-10  1:08         ` Khem Raj
2020-07-10  7:37           ` Mikko Rapeli
2020-07-12 18:41             ` akuster
2020-07-13  8:25               ` Mikko Rapeli
2020-07-13 15:46                 ` Khem Raj
2020-07-15  3:52                   ` akuster
2020-07-10 15:55           ` akuster
2020-07-10 16:18             ` Khem Raj
2020-07-01  0:06 ` [dunfel 04/32] proj: upgrade 7.0.0 -> 7.0.1 akuster
2020-07-01  0:06 ` [dunfel 05/32] netkit-rsh: properly append PACKAGECONFIG akuster
2020-07-01  0:06 ` [dunfel 06/32] zile: " akuster
2020-07-01  0:06 ` [dunfel 07/32] postgresql: 12.2 -> 12.3 akuster
2020-07-01  0:06 ` akuster [this message]
2020-07-01  8:48   ` [oe] [dunfel 08/32] multipath-tools: Fix build with json-c 0.14 and newer Adrian Bunk
2020-07-01 16:56     ` akuster
2020-07-01  0:06 ` [dunfel 09/32] libblockdev: upgrade 2.23 -> 2.24 akuster
2020-07-01  0:06 ` [dunfel 10/32] libvpx: upgrade 1.8.1 -> 1.8.2 akuster
2020-07-01  0:06 ` [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches akuster
2020-07-01  0:28   ` [oe] " Martin Jansa
2020-07-01  2:07     ` akuster
2020-07-01  0:06 ` [dunfel 12/32] jpnevulator: upgrade 2.3.4 -> 2.3.5 akuster
2020-07-01  0:06 ` [dunfel 13/32] libnftnl: upgrade 1.1.6 -> 1.1.7 akuster
2020-07-01  0:06 ` [dunfel 14/32] nftables: upgrade 0.9.4 -> 0.9.5 akuster
2020-07-01  0:07 ` [dunfel 15/32] haveged: upgrade 1.9.8 -> 1.9.9 akuster
2020-07-01  0:07 ` [dunfel 16/32] mm-common: upgrade 1.0..0 -> 1.0.1 akuster
2020-07-01  0:07 ` [dunfel 17/32] python-django: add RDEPENDS akuster
2020-07-01  0:07 ` [dunfel 18/32] python-m2crypto: Add RDEPENDS akuster
2020-07-01  0:07 ` [dunfel 19/32] python-django: set CVE_PRODUCT to be django akuster
2020-07-01  0:07 ` [dunfel 20/32] python3-m2crypto: add the missing rdepends akuster
2020-07-01  0:07 ` [dunfel 21/32] zstd: Upgrade 1.4.4 -> 1.4.5 akuster
2020-07-01  0:07 ` [dunfel 22/32] rsnapshot: upgrade 1.4.2 -> 1.4.3 akuster
2020-07-01  0:07 ` [dunfel 23/32] fuse3: upgrade 3.9.1 -> 3.9.2 akuster
2020-07-01  0:07 ` [dunfel 24/32] protobuf-c: disable parallelism to avoid race condition akuster
2020-07-01  0:07 ` [dunfel 25/32] openipmi: upgrade 2.0.28 -> 2.0.29 akuster
2020-07-01  0:07 ` [dunfel 26/32] twm: upgrade 1.0.10 -> 1.0.11 akuster
2020-07-01  0:07 ` [dunfel 27/32] libtalloc: fix upstream url akuster
2020-07-01  0:07 ` [dunfel 28/32] linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t akuster
2020-07-01  0:07 ` [dunfel 29/32] openh264: upgrade 2.1.0 -> 2.1.1 akuster
2020-07-01  0:07 ` [dunfel 30/32] tcpreplay: upgrade 4.3.2 -> 4.3.3 akuster
2020-07-01  0:07 ` [dunfel 31/32] python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17 akuster
2020-07-01  0:07 ` [dunfel 32/32] ntp: update 4.2.8p15 akuster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d345970f40c6f9caae869f048c358f598d37e109.1593561840.git.akuster808@gmail.com \
    --to=akuster808@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.