a0871be6c0
* Update buildroot-patches for 2020.11-rc1 buildroot * Update buildroot to 2020.11-rc1 Signed-off-by: Stefan Agner <stefan@agner.ch> * Don't rely on sfdisk --list-free output The --list-free (-F) argument does not allow machine readable mode. And it seems that the output format changes over time (different spacing, using size postfixes instead of raw blocks). Use sfdisk json output and calculate free partition space ourselfs. This works for 2.35 and 2.36 and is more robust since we rely on output which is meant for scripts to parse. * Migrate defconfigs for Buildroot 2020.11-rc1 In particular, rename BR2_TARGET_UBOOT_BOOT_SCRIPT(_SOURCE) to BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT(_SOURCE). * Rebase/remove systemd patches for systemd 246 * Drop apparmor/libapparmor from buildroot-external * hassos-persists: use /run as directory for lockfiles The U-Boot tools use /var/lock by default which is not created any more by systemd by default (it is under tmpfiles legacy.conf, which we no longer install). * Disable systemd-update-done.service The service is not suited for pure read-only systems. In particular the service needs to be able to write a file in /etc and /var. Remove the service. Note: This is a static service and cannot be removed using systemd-preset. * Disable apparmor.service for now The service loads all default profiles. Some might actually cause problems. E.g. the profile for ping seems not to match our setup for /etc/resolv.conf: [85503.634653] audit: type=1400 audit(1605286002.684:236): apparmor="DENIED" operation="open" profile="ping" name="/run/resolv.conf" pid=27585 comm="ping" requested_mask="r" denied_mask="r" fsuid=0 ouid=0
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From 82129852d74785267f95ef598ac483ff9af38a55 Mon Sep 17 00:00:00 2001
|
|
From: "mail@eworm.de" <mail@eworm.de>
|
|
Date: Sat, 25 Apr 2020 21:11:13 +0200
|
|
Subject: [PATCH] fix boolean value with json-c 0.14
|
|
|
|
Upstream json-c removed the TRUE and FALSE defines in commit
|
|
0992aac61f8b087efd7094e9ac2b84fa9c040fcd.
|
|
|
|
[mwilck]: Use stdbool.h, and keep the log message unchanged.
|
|
|
|
Signed-off-by: Christian Hesse <mail@eworm.de>
|
|
Signed-off-by: Martin Wilck <mwilck@suse.com>
|
|
Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
|
|
---
|
|
libdmmp/libdmmp_private.h | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/libdmmp/libdmmp_private.h b/libdmmp/libdmmp_private.h
|
|
index ac85b63f..b1a6ddea 100644
|
|
--- a/libdmmp/libdmmp_private.h
|
|
+++ b/libdmmp/libdmmp_private.h
|
|
@@ -30,6 +30,7 @@
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
+#include <stdbool.h>
|
|
#include <json.h>
|
|
|
|
#include "libdmmp/libdmmp.h"
|
|
@@ -82,7 +83,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) != true) { \
|
|
_error(ctx, "Invalid JSON output from multipathd IPC: " \
|
|
"key '%s' not found", key); \
|
|
rc = DMMP_ERR_IPC_ERROR; \
|
|
--
|
|
2.28.0
|
|
|