mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-19 07:39: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
61 lines
1.6 KiB
Diff
61 lines
1.6 KiB
Diff
From 18a9f7732944bfe45023f9dd7528295e7d43e678 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Wed, 12 Aug 2020 22:31:33 +0200
|
|
Subject: [PATCH] ui_common.h: fix build with gcc 10
|
|
|
|
Define global variables as extern in header to fix the build with gcc 10
|
|
which default to -fno-common: https://gcc.gnu.org/gcc-10/porting_to.html
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/55a8581f11e776439782c228441ef1c8c1243386
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: sent to iftop-users@lists.beasts.org]
|
|
---
|
|
ui_common.c | 6 ++++++
|
|
ui_common.h | 10 +++++-----
|
|
2 files changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/ui_common.c b/ui_common.c
|
|
index dcf6646..b1027ec 100644
|
|
--- a/ui_common.c
|
|
+++ b/ui_common.c
|
|
@@ -17,6 +17,12 @@
|
|
|
|
#include "ui_common.h"
|
|
|
|
+sorted_list_type screen_list;
|
|
+host_pair_line totals;
|
|
+int peaksent, peakrecv, peaktotal;
|
|
+hash_type* screen_hash;
|
|
+hash_type* service_hash;
|
|
+
|
|
/* 2, 10 and 40 seconds */
|
|
int history_divs[HISTORY_DIVISIONS] = {1, 5, 20};
|
|
|
|
diff --git a/ui_common.h b/ui_common.h
|
|
index 63ae5bb..add72fe 100644
|
|
--- a/ui_common.h
|
|
+++ b/ui_common.h
|
|
@@ -33,12 +33,12 @@ typedef struct host_pair_line_tag {
|
|
|
|
extern options_t options;
|
|
|
|
-sorted_list_type screen_list;
|
|
-host_pair_line totals;
|
|
-int peaksent, peakrecv, peaktotal;
|
|
+extern sorted_list_type screen_list;
|
|
+extern host_pair_line totals;
|
|
+extern int peaksent, peakrecv, peaktotal;
|
|
extern history_type history_totals;
|
|
-hash_type* screen_hash;
|
|
-hash_type* service_hash;
|
|
+extern hash_type* screen_hash;
|
|
+extern hash_type* service_hash;
|
|
|
|
void analyse_data(void);
|
|
void screen_list_init(void);
|
|
--
|
|
2.27.0
|
|
|