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,38 +0,0 @@
|
||||
From 8a9c3db14a390c0a8788405e52e9b8737a430191 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Duskett <aduskett@gmail.com>
|
||||
Date: Mon, 12 Feb 2018 07:49:34 -0500
|
||||
Subject: [PATCH] libcpprestsdk: fix building as a static library
|
||||
|
||||
Use pkg-config to find OpenSSL. This will automatically find any
|
||||
dependent libraries and put them in the correct order for linking.
|
||||
|
||||
Upstream status: submitted
|
||||
https://github.com/Microsoft/cpprestsdk/pull/688
|
||||
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
Release/cmake/cpprest_find_openssl.cmake | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Release/cmake/cpprest_find_openssl.cmake b/Release/cmake/cpprest_find_openssl.cmake
|
||||
index 0b49a7e..2be8afb 100644
|
||||
--- a/Release/cmake/cpprest_find_openssl.cmake
|
||||
+++ b/Release/cmake/cpprest_find_openssl.cmake
|
||||
@@ -41,8 +41,12 @@ function(cpprest_find_openssl)
|
||||
# This should prevent linking against the system provided 0.9.8y
|
||||
set(_OPENSSL_VERSION "")
|
||||
endif()
|
||||
- find_package(OpenSSL 1.0.0 REQUIRED)
|
||||
-
|
||||
+ if(UNIX)
|
||||
+ find_package(PkgConfig REQUIRED)
|
||||
+ pkg_search_module(OPENSSL openssl REQUIRED)
|
||||
+ else()
|
||||
+ find_package(OpenSSL 1.0.0 REQUIRED)
|
||||
+ endif()
|
||||
INCLUDE(CheckCXXSourceCompiles)
|
||||
set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
|
||||
set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
|
||||
--
|
||||
2.14.3
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
config BR2_PACKAGE_LIBCPPRESTSDK
|
||||
bool "libcpprestsdk"
|
||||
depends on BR2_ENABLE_LOCALE
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_USE_WCHAR # boost
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
|
||||
@@ -13,7 +14,6 @@ config BR2_PACKAGE_LIBCPPRESTSDK
|
||||
select BR2_PACKAGE_BOOST_REGEX
|
||||
select BR2_PACKAGE_BOOST_THREAD
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
The C++ REST SDK is a Microsoft project for cloud-based
|
||||
client-server communication in native code using a modern
|
||||
@@ -22,10 +22,10 @@ config BR2_PACKAGE_LIBCPPRESTSDK
|
||||
|
||||
https://github.com/Microsoft/cpprestsdk
|
||||
|
||||
comment "libcpprestsdk needs a toolchain w/ NPTL, C++, wchar"
|
||||
comment "libcpprestsdk needs a toolchain w/ NPTL, C++, wchar, locale"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
|
||||
!BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_USE_WCHAR
|
||||
!BR2_USE_WCHAR || !BR2_ENABLE_LOCALE
|
||||
|
||||
comment "libcpprestsdk needs exception_ptr"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 f2628b248f714d7bbd6a536553bc3782602c68ca1b129017985dd70cc3515278 libcpprestsdk-2.10.14.tar.gz
|
||||
sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
|
||||
sha256 3d75e17c7d79131320438f2a15331f7ca6281c38c0e2daa27f051e290eeb8681 libcpprestsdk-2.10.16.tar.gz
|
||||
sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
|
||||
|
||||
@@ -4,13 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCPPRESTSDK_VERSION = 2.10.14
|
||||
LIBCPPRESTSDK_VERSION = 2.10.16
|
||||
LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,v$(LIBCPPRESTSDK_VERSION))
|
||||
LIBCPPRESTSDK_LICENSE = MIT
|
||||
LIBCPPRESTSDK_LICENSE_FILES = license.txt
|
||||
LIBCPPRESTSDK_SUBDIR = Release
|
||||
LIBCPPRESTSDK_INSTALL_STAGING = YES
|
||||
LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
|
||||
LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl
|
||||
LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DBUILD_SAMPLES=OFF
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
@@ -25,12 +25,19 @@ ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
LIBCPPRESTSDK_CXXFLAGS += -latomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ZLIB),y)
|
||||
LIBCPPRESTSDK_DEPENDENCIES += zlib
|
||||
LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=OFF
|
||||
# brotli needs compression
|
||||
ifeq ($(BR2_PACKAGE_BROTLI),y)
|
||||
LIBCPPRESTSDK_DEPENDENCIES += brotli
|
||||
LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=OFF
|
||||
else
|
||||
LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_BROTLI=ON
|
||||
endif
|
||||
else
|
||||
LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_COMPRESSION=ON
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y)
|
||||
LIBCPPRESTSDK_DEPENDENCIES += websocketpp
|
||||
|
||||
Reference in New Issue
Block a user