mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-11-15 05:39:28 +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
65 lines
2.5 KiB
Diff
65 lines
2.5 KiB
Diff
From 8458abb357cd981f55d730ec2d74459a3042e571 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Tue, 6 Oct 2020 21:52:20 +0200
|
|
Subject: [PATCH] fix build with gcc 10
|
|
|
|
Define variables in header files as extern to avoid the following build failure
|
|
with gcc 10 (which defaults to -fno-common):
|
|
|
|
/home/giuliobenetti/autobuild/run/instance-3/output-1/host/bin/arm-buildroot-linux-gnueabihf-ld:
|
|
/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/mmc.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67:
|
|
multiple definition of `sdio_func_type';
|
|
/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/build/drivers/mmc/core/core.o:/home/giuliobenetti/autobuild/run/instance-3/output-1/build/xvisor-0.3.0/drivers/mmc/core/core.h:67:
|
|
first defined here
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/b6070c0721b33824e71833ce53423979980aa598
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/xvisor/xvisor/pull/125]
|
|
---
|
|
drivers/mmc/core/core.h | 2 +-
|
|
emulators/display/drawfn.h | 10 +++++-----
|
|
2 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h
|
|
index d75d135a..e2ca3141 100644
|
|
--- a/drivers/mmc/core/core.h
|
|
+++ b/drivers/mmc/core/core.h
|
|
@@ -64,7 +64,7 @@ int mmc_go_idle(struct mmc_host *host);
|
|
* Note: Must be called with host->lock held.
|
|
*/
|
|
extern struct vmm_bus sdio_bus_type;
|
|
-struct vmm_device_type sdio_func_type;
|
|
+extern struct vmm_device_type sdio_func_type;
|
|
|
|
int __sdio_attach(struct mmc_host *host);
|
|
|
|
diff --git a/emulators/display/drawfn.h b/emulators/display/drawfn.h
|
|
index f9163cff..385deaf6 100644
|
|
--- a/emulators/display/drawfn.h
|
|
+++ b/emulators/display/drawfn.h
|
|
@@ -69,14 +69,14 @@ typedef void (*drawfn)(struct vmm_surface *,
|
|
DRAWFN_ORDER_MAX * \
|
|
DRAWFN_FORMAT_MAX)
|
|
|
|
-drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE];
|
|
+extern drawfn drawfn_surface_fntable_8[DRAWFN_FNTABLE_SIZE];
|
|
|
|
-drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE];
|
|
+extern drawfn drawfn_surface_fntable_15[DRAWFN_FNTABLE_SIZE];
|
|
|
|
-drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE];
|
|
+extern drawfn drawfn_surface_fntable_16[DRAWFN_FNTABLE_SIZE];
|
|
|
|
-drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE];
|
|
+extern drawfn drawfn_surface_fntable_24[DRAWFN_FNTABLE_SIZE];
|
|
|
|
-drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE];
|
|
+extern drawfn drawfn_surface_fntable_32[DRAWFN_FNTABLE_SIZE];
|
|
|
|
#endif
|
|
--
|
|
2.28.0
|
|
|