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
@@ -0,0 +1,47 @@
|
||||
From 0982308255dd3fd70e7b93aa88a8f3c5b9c1b845 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 30 Aug 2020 21:15:06 +0200
|
||||
Subject: [PATCH] src/CMakeLists.txt: fix build with mbedtls but without zlib
|
||||
|
||||
Building with mbedtls but without zlib will result in the following
|
||||
build failure:
|
||||
|
||||
-- Found MbedTLS: /home/peko/autobuild/instance-0/output-1/per-package/rtty/host/powerpc64-buildroot-linux-gnu/sysroot/usr/lib/libmbedtls.so (found version "2.16.7")
|
||||
-- Could NOT find ZLIB (missing: ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
|
||||
-- Select MbedTLS(PolarSSL) as the SSL backend
|
||||
CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
|
||||
Please set them or make sure they are set and tested correctly in the CMake files:
|
||||
ZLIB_LIBRARY
|
||||
linked by target "rtty" in directory /home/peko/autobuild/instance-0/output-1/build/rtty-7.1.4/src
|
||||
|
||||
-- Configuring incomplete, errors occurred!
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/a0ebffe58bbf14cab74b7d2111d4d88a9c725273
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/zhaojh329/rtty/pull/77]
|
||||
---
|
||||
src/CMakeLists.txt | 6 +++++-
|
||||
1 file changed, 5 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 10f6626..d09e848 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -77,7 +77,11 @@ else()
|
||||
elseif(RTTY_USE_MBEDTLS)
|
||||
set(SSL_NAME "MbedTLS(PolarSSL)")
|
||||
set(SSL_INC ${MBEDTLS_INCLUDE_DIR})
|
||||
- set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
+ if(ZLIB_FOUND)
|
||||
+ set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})
|
||||
+ else()
|
||||
+ set(SSL_LIB ${MBEDTLS_LIBRARIES})
|
||||
+ endif()
|
||||
set(RTTY_HAVE_MBEDTLS_CONFIG 1)
|
||||
endif()
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
8
buildroot/package/rtty/Config.in
Normal file
8
buildroot/package/rtty/Config.in
Normal file
@@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_RTTY
|
||||
bool "rtty"
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_LIBEV
|
||||
help
|
||||
Access your device's terminal from anywhere via the web.
|
||||
|
||||
https://github.com/zhaojh329/rtty
|
||||
2
buildroot/package/rtty/rtty.hash
Normal file
2
buildroot/package/rtty/rtty.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
sha256 f0b8cf4c4d3d4b34d10097fe430d32ab1576edbf41131d27b6b964e078be1716 rtty-7.1.4.tar.gz
|
||||
sha256 99efed4bbc0b62f96f999ef23399e38234fb91651af734fd389a52b033a85b55 LICENSE
|
||||
38
buildroot/package/rtty/rtty.mk
Normal file
38
buildroot/package/rtty/rtty.mk
Normal file
@@ -0,0 +1,38 @@
|
||||
################################################################################
|
||||
#
|
||||
# rtty
|
||||
#
|
||||
################################################################################
|
||||
|
||||
RTTY_VERSION = 7.1.4
|
||||
RTTY_SITE = https://github.com/zhaojh329/rtty/releases/download/v$(RTTY_VERSION)
|
||||
RTTY_LICENSE = MIT
|
||||
RTTY_LICENSE_FILES = LICENSE
|
||||
RTTY_DEPENDENCIES = libev
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MBEDTLS),y)
|
||||
RTTY_DEPENDENCIES += mbedtls
|
||||
RTTY_CONF_OPTS += \
|
||||
-DRTTY_SSL_SUPPORT=ON \
|
||||
-DRTTY_USE_MBEDTLS=ON \
|
||||
-DRTTY_USE_OPENSSL=OFF \
|
||||
-DRTTY_USE_WOLFSSL=OFF
|
||||
else ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
RTTY_DEPENDENCIES += host-pkgconf openssl
|
||||
RTTY_CONF_OPTS += \
|
||||
-DRTTY_SSL_SUPPORT=ON \
|
||||
-DRTTY_USE_MBEDTLS=OFF \
|
||||
-DRTTY_USE_OPENSSL=ON \
|
||||
-DRTTY_USE_WOLFSSL=OFF
|
||||
else ifeq ($(BR2_PACKAGE_WOLFSSL),y)
|
||||
RTTY_DEPENDENCIES += wolfssl
|
||||
RTTY_CONF_OPTS += \
|
||||
-DRTTY_SSL_SUPPORT=ON \
|
||||
-DRTTY_USE_MBEDTLS=OFF \
|
||||
-DRTTY_USE_OPENSSL=OFF \
|
||||
-DRTTY_USE_WOLFSSL=ON
|
||||
else
|
||||
RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
Reference in New Issue
Block a user