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,49 +1,37 @@
|
||||
From c0b3dbb43aa3a38c47311556c85eadc6072e2d68 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Tue, 14 Feb 2017 22:02:26 +0100
|
||||
Subject: [PATCH] Fix Libs.private flags for mbedtls
|
||||
From b7f14a800bbdad193f45695bc5b8c5173f3882ba Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 10 Feb 2019 17:51:05 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: fix mbedtls libraries in bctoolbox.pc
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Static linking with bctoolbox fails when using pkg-config as the
|
||||
generated bctoolbox.pc file only consists of an '-L' string without any
|
||||
search path or libraries flags.
|
||||
|
||||
That's because of an typo in `mbedtls_library_path`. However,
|
||||
`mbedtls_library_path` contains a string of the mbedtls libraries
|
||||
concatenated by an ';' which cannot be parsed by pkg-config.
|
||||
|
||||
Therefore, use `MBEDTLS_LIBRARY` instead of `MBEDTLS_LIBRARIES` to get
|
||||
the library path.
|
||||
|
||||
Furthermore, add the three mbedtls libraries *mbedtls*, *mbedcrypto*, and
|
||||
*mbedx509* to `LIBS_PRIVATE` so these libraries are added to the
|
||||
`Libs.private` field of bctoolbox.pc.
|
||||
|
||||
Upstream status: Pending
|
||||
bctoolbox.pc should not contain the full libraries path, path should be
|
||||
given by -L and library names by -l
|
||||
So sent back the fix already suggested by Jörg Krause in
|
||||
https://github.com/BelledonneCommunications/bctoolbox/pull/4
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://github.com/BelledonneCommunications/bctoolbox/pull/7]
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
CMakeLists.txt | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ed7aa00..4127f0e 100644
|
||||
index 29f3eb6..b2f26c2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -103,8 +103,8 @@ else()
|
||||
@@ -101,9 +101,8 @@ else()
|
||||
endif()
|
||||
|
||||
if(MBEDTLS_FOUND)
|
||||
- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH)
|
||||
- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}")
|
||||
- string(REPLACE ";" " " MBEDTLS_LIBRARIES_STR "${MBEDTLS_LIBRARIES}")
|
||||
- set(LIBS_PRIVATE "${LIBS_PRIVATE} ${MBEDTLS_LIBRARIES_STR}")
|
||||
+ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH)
|
||||
+ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509")
|
||||
endif()
|
||||
if(POLARSSL_FOUND)
|
||||
get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH)
|
||||
--
|
||||
2.11.1
|
||||
|
||||
|
||||
@@ -2,6 +2,8 @@ config BR2_PACKAGE_BCTOOLBOX
|
||||
bool "bctoolbox"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
Utilities library used by Belledonne Communications
|
||||
softwares like belle-sip, mediastreamer2 and linphone.
|
||||
@@ -12,3 +14,6 @@ config BR2_PACKAGE_BCTOOLBOX
|
||||
|
||||
comment "bctoolbox needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
comment "bctoolbox needs a toolchain not affected by GCC bug 64735"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 da7df7ff359a9829e9e6ef98dfe9fead0cf735b8a4a5da1b1047f467dee1b2a9 bctoolbox-0.4.0.tar.gz
|
||||
sha256 d8501e3793c10abbf913759d7a0e5f6eb3140af6bacf5e2bdcd532049bde69c0 bctoolbox-4.3.1.tar.gz
|
||||
sha256 849dd903d98f12a964466ccfbaf3a1de1f94ad0ebd49a59d12f8ce4506f9f647 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BCTOOLBOX_VERSION = 0.4.0
|
||||
BCTOOLBOX_VERSION = 4.3.1
|
||||
BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
|
||||
BCTOOLBOX_LICENSE = GPL-2.0+
|
||||
BCTOOLBOX_LICENSE_FILES = COPYING
|
||||
@@ -20,6 +20,11 @@ BCTOOLBOX_CONF_OPTS = \
|
||||
-DGIT_EXECUTABLE=OFF \
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
BCTOOLBOX_DEPENDENCIES += libiconv
|
||||
BCTOOLBOX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -liconv"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MBEDTLS),y)
|
||||
BCTOOLBOX_DEPENDENCIES += mbedtls
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON
|
||||
|
||||
Reference in New Issue
Block a user