mirror of
https://github.com/home-assistant/operating-system.git
synced 2025-04-25 09:37:15 +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
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 35ff9ed71b89f34e5462de1ee63f88edf98aeb69 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sat, 31 Oct 2020 21:08:53 +0100
|
|
Subject: [PATCH] sshfs.c: fix build with gcc 4.8
|
|
|
|
Fix the following build failure with gcc 4.8:
|
|
|
|
../sshfs.c:1092:2: error: 'for' loop initial declarations are only allowed in C99 mode
|
|
for (int i = 0; i < sshfs.max_conns; i++) {
|
|
^
|
|
|
|
This build failure has been added with
|
|
https://github.com/libfuse/sshfs/commit/8822b60d9dbd9907065e7999f616b11ddce6d584
|
|
|
|
Fixes:
|
|
- http://autobuild.buildroot.org/results/2dbdc579c55543175716d5f739cabe2ad0864ed6
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
[Upstream status: https://github.com/libfuse/sshfs/pull/233]
|
|
---
|
|
sshfs.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/sshfs.c b/sshfs.c
|
|
index d5f2ff7..2c2db42 100644
|
|
--- a/sshfs.c
|
|
+++ b/sshfs.c
|
|
@@ -1068,6 +1068,7 @@ static struct conn* get_conn(const struct sshfs_file *sf,
|
|
const char *path)
|
|
{
|
|
struct conntab_entry *ce;
|
|
+ int i;
|
|
|
|
if (sshfs.max_conns == 1)
|
|
return &sshfs.conns[0];
|
|
@@ -1089,7 +1090,7 @@ static struct conn* get_conn(const struct sshfs_file *sf,
|
|
|
|
int best_index = 0;
|
|
uint64_t best_score = ~0ULL; /* smaller is better */
|
|
- for (int i = 0; i < sshfs.max_conns; i++) {
|
|
+ for (i = 0; i < sshfs.max_conns; i++) {
|
|
uint64_t score = ((uint64_t) sshfs.conns[i].req_count << 43) +
|
|
((uint64_t) sshfs.conns[i].dir_count << 22) +
|
|
((uint64_t) sshfs.conns[i].file_count << 1) +
|
|
--
|
|
2.28.0
|
|
|