Bump buildroot to 2020.11-rc1 (#985)
* 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
This commit is contained in:
Stefan Agner
@@ -1,106 +0,0 @@
|
||||
From 4fd8a07b560dcd4ad5706684d512d33707de3da0 Mon Sep 17 00:00:00 2001
|
||||
From: Jean-Francois Dockes <jf@dockes.org>
|
||||
Date: Fri, 3 Jul 2020 19:26:37 +0200
|
||||
Subject: [PATCH] Adapt streamproxy to newer microhttpd where results are now
|
||||
an enum
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
[downloaded from upstream commit
|
||||
https://framagit.org/medoc92/upmpdcli/-/commit/4fd8a07b560dcd4ad5706684d512d33707de3da0]
|
||||
---
|
||||
src/mediaserver/cdplugins/streamproxy.cpp | 23 ++++++++++++++---------
|
||||
1 file changed, 14 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/mediaserver/cdplugins/streamproxy.cpp b/src/mediaserver/cdplugins/streamproxy.cpp
|
||||
index abc57915..8d283834 100644
|
||||
--- a/src/mediaserver/cdplugins/streamproxy.cpp
|
||||
+++ b/src/mediaserver/cdplugins/streamproxy.cpp
|
||||
@@ -28,6 +28,11 @@
|
||||
#include <fcntl.h>
|
||||
#include <microhttpd.h>
|
||||
|
||||
+
|
||||
+#if MHD_VERSION < 0x00097002
|
||||
+typedef int MHD_Result;
|
||||
+#endif
|
||||
+
|
||||
#include <mutex>
|
||||
#include <condition_variable>
|
||||
#include <unordered_map>
|
||||
@@ -155,7 +160,7 @@ public:
|
||||
~Internal();
|
||||
bool startMHD();
|
||||
|
||||
- int answerConn(
|
||||
+ MHD_Result answerConn(
|
||||
struct MHD_Connection *connection, const char *url,
|
||||
const char *method, const char *version,
|
||||
const char *upload_data, size_t *upload_data_size,
|
||||
@@ -202,7 +207,7 @@ StreamProxy::Internal::Internal(int _listenport, UrlTransFunc _urltrans)
|
||||
}
|
||||
|
||||
|
||||
-static int answer_to_connection(
|
||||
+static MHD_Result answer_to_connection(
|
||||
void *cls, struct MHD_Connection *conn,
|
||||
const char *url, const char *method, const char *version,
|
||||
const char *upload_data, size_t *upload_data_size,
|
||||
@@ -214,7 +219,7 @@ static int answer_to_connection(
|
||||
return internal->answerConn(
|
||||
conn, url, method, version, upload_data, upload_data_size, con_cls);
|
||||
} else {
|
||||
- return -1;
|
||||
+ return MHD_NO;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -238,8 +243,8 @@ static int print_out_key (void *cls, enum MHD_ValueKind kind,
|
||||
}
|
||||
#endif /* PRINT_KEYS */
|
||||
|
||||
-static int mapvalues_cb(void *cls, enum MHD_ValueKind kind,
|
||||
- const char *key, const char *value)
|
||||
+static MHD_Result mapvalues_cb(void *cls, enum MHD_ValueKind kind,
|
||||
+ const char *key, const char *value)
|
||||
{
|
||||
unordered_map<string,string> *mp = (unordered_map<string,string> *)cls;
|
||||
if (mp) {
|
||||
@@ -307,7 +312,7 @@ static bool processRange(struct MHD_Connection *mhdconn, uint64_t& offset)
|
||||
return true;
|
||||
}
|
||||
|
||||
-int StreamProxy::Internal::answerConn(
|
||||
+MHD_Result StreamProxy::Internal::answerConn(
|
||||
struct MHD_Connection *mhdconn, const char *_url,
|
||||
const char *method, const char *version,
|
||||
const char *upload_data, size_t *upload_data_size,
|
||||
@@ -352,7 +357,7 @@ int StreamProxy::Internal::answerConn(
|
||||
return MHD_NO;
|
||||
}
|
||||
MHD_add_response_header (response, "Location", url.c_str());
|
||||
- int ret = MHD_queue_response(mhdconn, 302, response);
|
||||
+ MHD_Result ret = MHD_queue_response(mhdconn, 302, response);
|
||||
MHD_destroy_response(response);
|
||||
return ret;
|
||||
}
|
||||
@@ -393,7 +398,7 @@ int StreamProxy::Internal::answerConn(
|
||||
int code = httpcode ? httpcode : MHD_HTTP_INTERNAL_SERVER_ERROR;
|
||||
struct MHD_Response *response =
|
||||
MHD_create_response_from_buffer(0, 0, MHD_RESPMEM_PERSISTENT);
|
||||
- int ret = MHD_queue_response(mhdconn, code, response);
|
||||
+ MHD_Result ret = MHD_queue_response(mhdconn, code, response);
|
||||
MHD_destroy_response(response);
|
||||
LOGINF("StreamProxy::answerConn (1): return with http code: " <<
|
||||
code << endl);
|
||||
@@ -434,7 +439,7 @@ int StreamProxy::Internal::answerConn(
|
||||
if (reader->fetcher->fetchDone(&fetchcode, &httpcode)) {
|
||||
code = httpcode ? httpcode : MHD_HTTP_INTERNAL_SERVER_ERROR;
|
||||
}
|
||||
- int ret = MHD_queue_response(mhdconn, code, response);
|
||||
+ MHD_Result ret = MHD_queue_response(mhdconn, code, response);
|
||||
MHD_destroy_response(response);
|
||||
return ret;
|
||||
}
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.5.tar.gz.sha256:
|
||||
sha256 af0c13b6ab8720d98451307010c33462e9a3f50178bae82c593fd2dd12e31b0e upmpdcli-1.4.5.tar.gz
|
||||
# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.4.14.tar.gz.sha256:
|
||||
sha256 e3d90dedee6a942acc049324ca81b7f008d217d386a3e2590a2ca5670cc9df05 upmpdcli-1.4.14.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UPMPDCLI_VERSION = 1.4.5
|
||||
UPMPDCLI_VERSION = 1.4.14
|
||||
UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads
|
||||
UPMPDCLI_LICENSE = LGPL-2.1+
|
||||
UPMPDCLI_LICENSE_FILES = COPYING
|
||||
|
||||
Reference in New Issue
Block a user