mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-16 14:19:26 +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
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
From 084126b03f29b33ab3e657c66e8c6a439f27f8e1 Mon Sep 17 00:00:00 2001
|
|
From: Harald Geyer <harald@ccbib.org>
|
|
Date: Mon, 10 Feb 2020 13:15:10 +0100
|
|
Subject: [PATCH] Fix compilation with GCC >= 10.x
|
|
|
|
Starting with GCC >= 10.x, -fno-common is used as default
|
|
instead of -fcommon. This patch fixes the compilation.
|
|
|
|
Closes: #148
|
|
|
|
Suggested-by: Conrad Kostecki <conrad@kostecki.com>
|
|
Signed-off-by: Harald Geyer <harald@ccbib.org>
|
|
|
|
[Retrieved from:
|
|
https://github.com/lcdproc/lcdproc/commit/084126b03f29b33ab3e657c66e8c6a439f27f8e1]
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
---
|
|
clients/lcdproc/iface.c | 1 +
|
|
clients/lcdproc/iface.h | 2 +-
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
|
|
index 40e50cb7..1ac355bd 100644
|
|
--- a/clients/lcdproc/iface.c
|
|
+++ b/clients/lcdproc/iface.c
|
|
@@ -32,6 +32,7 @@
|
|
#define UNSET_INT -1
|
|
#define UNSET_STR "\01"
|
|
|
|
+IfaceInfo iface[MAX_INTERFACES];
|
|
|
|
static int iface_count = 0; /* number of interfaces */
|
|
static char unit_label[10] = "B"; /* default unit label is Bytes */
|
|
diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
|
|
index cc6dbaaf..c1bd6b5b 100644
|
|
--- a/clients/lcdproc/iface.h
|
|
+++ b/clients/lcdproc/iface.h
|
|
@@ -18,7 +18,7 @@
|
|
/** max number of interfaces in multi-interface mode */
|
|
#define MAX_INTERFACES 3
|
|
|
|
-IfaceInfo iface[MAX_INTERFACES]; /* interface info */
|
|
+extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */
|
|
|
|
/** Update screen content */
|
|
int iface_screen(int rep, int display, int *flags_ptr);
|