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:
@@ -1,56 +0,0 @@
|
||||
From 600d0a36c2af785c8284acadeb062d73247281af Mon Sep 17 00:00:00 2001
|
||||
From: Matt Weber <matthew.weber@rockwellcollins.com>
|
||||
Date: Sun, 23 Jul 2017 09:21:23 -0500
|
||||
Subject: [PATCH] nginx-upload-module: add openssl lib dependency
|
||||
|
||||
When building against nginx 1.11.2+, requires additional
|
||||
-lcrypto dependency. (Nginx changed crypto approach
|
||||
and dependencies for openssl are no longer default)
|
||||
|
||||
More details found here:
|
||||
https://github.com/vkholodkov/nginx-upload-module/issues/79
|
||||
|
||||
Upstream pull request:
|
||||
https://github.com/vkholodkov/nginx-upload-module/pull/93
|
||||
|
||||
Resolves build failure:
|
||||
objs/addon/nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3/ngx_http_upload_module.o \
|
||||
objs/ngx_modules.o \
|
||||
-ldl -lpthread -lpthread -lpcre -lz -latomic_ops \
|
||||
-Wl,-E
|
||||
ngx_http_upload_module.o: In function `ngx_http_upload_flush_output_buffer':
|
||||
ngx_http_upload_module.c:1625: undefined reference to `MD5_Update'
|
||||
ngx_http_upload_module.c:1628: undefined reference to `SHA1_Update'
|
||||
ngx_http_upload_module.c:1631: undefined reference to `SHA256_Update'
|
||||
ngx_http_upload_module.c:1634: undefined reference to `SHA512_Update'
|
||||
|
||||
Fixes:
|
||||
http://autobuild.buildroot.net/results/e25f8ba8d8743e47a77707cf582e58477e1860e6
|
||||
http://autobuild.buildroot.net/results/c4aa6e22033be934bd311cd9761f646d44618dc0
|
||||
http://autobuild.buildroot.net/results/75e935d248b46df11c32c95526423a2287ac8c62
|
||||
|
||||
Signed-off-by: Matthew Weber <matthew.weber@rockwellcollins.com>
|
||||
---
|
||||
config | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/config b/config
|
||||
index cabd4f1..293529f 100644
|
||||
--- a/config
|
||||
+++ b/config
|
||||
@@ -1,11 +1,10 @@
|
||||
-USE_MD5=YES
|
||||
-USE_SHA1=YES
|
||||
ngx_addon_name=ngx_http_upload_module
|
||||
|
||||
if test -n "$ngx_module_link"; then
|
||||
ngx_module_type=HTTP
|
||||
ngx_module_name=$ngx_addon_name
|
||||
ngx_module_srcs="$ngx_addon_dir/ngx_http_upload_module.c"
|
||||
+ ngx_module_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)"
|
||||
|
||||
. auto/module
|
||||
else
|
||||
--
|
||||
1.9.1
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
#Locally Computed:
|
||||
sha256 5f1c3c2b9858b9cacd877a0f2df9b9263734e9cef8d837b73f0e659c0f7fde2d nginx-upload-70bee48f1811eecd255ed094ce9f0fb560c390c3.tar.gz
|
||||
sha256 61ad5bcb67c8f688a4c7a5611311a351049361840b8dfe78be542066f475166e nginx-upload-4423994c7d8fb491d95867f6af968585d949e7a9.tar.gz
|
||||
sha256 825f9684c427e29fd1ab085d5c421a4cbf96a460f3c58884a42c28bfbac5e544 LICENCE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
NGINX_UPLOAD_VERSION = 70bee48f1811eecd255ed094ce9f0fb560c390c3
|
||||
NGINX_UPLOAD_VERSION = 4423994c7d8fb491d95867f6af968585d949e7a9
|
||||
NGINX_UPLOAD_SITE = $(call github,vkholodkov,nginx-upload-module,$(NGINX_UPLOAD_VERSION))
|
||||
NGINX_UPLOAD_LICENSE = BSD-3-Clause
|
||||
NGINX_UPLOAD_LICENSE_FILES = LICENCE
|
||||
|
||||
Reference in New Issue
Block a user