mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-15 21:59:27 +00:00
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
56 lines
1.8 KiB
Diff
56 lines
1.8 KiB
Diff
From ffa935dc881c394a824e063c8fde7dd102e06d8c Mon Sep 17 00:00:00 2001
|
||
From: Romain Naour <romain.naour@gmail.com>
|
||
Date: Fri, 8 May 2020 23:39:59 +0200
|
||
Subject: [PATCH] main: fix typo
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
The function yaml_mapping_start_event_initialize()
|
||
take yaml_mapping_style_t style as last argument:
|
||
|
||
int yaml_mapping_start_event_initialize(
|
||
yaml_event_t *event,
|
||
const yaml_char_t *anchor,
|
||
const yaml_char_t *tag,
|
||
int implicit,
|
||
yaml_mapping_style_t style)
|
||
|
||
Use YAML_ANY_MAPPING_STYLE instead of YAML_ANY_SEQUENCE_STYLE
|
||
|
||
Fixes:
|
||
main.c:173:5: error: implicit conversion from ‘enum yaml_sequence_style_e’ to ‘yaml_mapping_style_t’ {aka ‘enum yaml_mapping_style_e’} [-Werror=enum-conversion]
|
||
173 | YAML_ANY_SEQUENCE_STYLE))
|
||
| ^~~~~~~~~~~~~~~~~~~~~~~
|
||
|
||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||
---
|
||
main.c | 4 ++--
|
||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
||
diff --git a/main.c b/main.c
|
||
index 29a7c42..1685d3e 100644
|
||
--- a/main.c
|
||
+++ b/main.c
|
||
@@ -170,7 +170,7 @@ static bool init_emitter(FILE *ts_file)
|
||
/* Mapping start */
|
||
if (!yaml_mapping_start_event_initialize(&event,
|
||
NULL, NULL , YAML_IMPLICIT,
|
||
- YAML_ANY_SEQUENCE_STYLE))
|
||
+ YAML_ANY_MAPPING_STYLE))
|
||
ERROR_GOTO(emitter_delete,
|
||
"Failed to initialize YAML mapping start event");
|
||
if (!yaml_emitter_emit(&emitter, &event))
|
||
@@ -263,7 +263,7 @@ static bool fill_timestamp(uint32_t core, uint64_t count, uint64_t addr,
|
||
/* Mapping start */
|
||
if (!yaml_mapping_start_event_initialize(&event,
|
||
NULL, NULL , YAML_IMPLICIT,
|
||
- YAML_ANY_SEQUENCE_STYLE))
|
||
+ YAML_ANY_MAPPING_STYLE))
|
||
ERROR_RETURN_FALSE(
|
||
"Failed to initialize YAML mapping start event");
|
||
if (!yaml_emitter_emit(&emitter, &event))
|
||
--
|
||
2.25.4
|
||
|