mirror of
https://github.com/home-assistant/operating-system.git
synced 2026-02-15 07:29:08 +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.6 KiB
Diff
47 lines
1.6 KiB
Diff
From 75d2b1787b3253784a94c66016829acf1f442526 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <75d2b1787b3253784a94c66016829acf1f442526.1603688719.git.baruch@tkos.co.il>
|
|
From: Baruch Siach <baruch@tkos.co.il>
|
|
Date: Mon, 26 Oct 2020 06:56:49 +0200
|
|
Subject: [PATCH] libssh2: fix build with disabled proxy support
|
|
|
|
Build breaks because the http_proxy field is missing:
|
|
|
|
vssh/libssh2.c: In function 'ssh_connect':
|
|
vssh/libssh2.c:3119:10: error: 'struct connectdata' has no member named 'http_proxy'
|
|
if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) {
|
|
^
|
|
|
|
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
|
---
|
|
Upstream status: https://github.com/curl/curl/pull/6125
|
|
|
|
lib/vssh/libssh2.c | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/lib/vssh/libssh2.c b/lib/vssh/libssh2.c
|
|
index 6c6db049bf5a..74cd5d887549 100644
|
|
--- a/lib/vssh/libssh2.c
|
|
+++ b/lib/vssh/libssh2.c
|
|
@@ -3094,6 +3094,7 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done)
|
|
return CURLE_FAILED_INIT;
|
|
}
|
|
|
|
+#ifndef CURL_DISABLE_PROXY
|
|
if(conn->http_proxy.proxytype == CURLPROXY_HTTPS) {
|
|
/*
|
|
* This crazy union dance is here to avoid assigning a void pointer a
|
|
@@ -3132,7 +3133,9 @@ static CURLcode ssh_connect(struct connectdata *conn, bool *done)
|
|
libssh2_session_callback_set(ssh->ssh_session,
|
|
LIBSSH2_CALLBACK_SEND, sshsend.sendp);
|
|
}
|
|
- else if(conn->handler->protocol & CURLPROTO_SCP) {
|
|
+ else
|
|
+#endif /* CURL_DISABLE_PROXY */
|
|
+ if(conn->handler->protocol & CURLPROTO_SCP) {
|
|
conn->recv[FIRSTSOCKET] = scp_recv;
|
|
conn->send[FIRSTSOCKET] = scp_send;
|
|
}
|
|
--
|
|
2.28.0
|
|
|