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,39 +0,0 @@
|
||||
Fix pthread detection
|
||||
|
||||
configure.in always calls AC_CHECK_COMP_OPT(pthread) which succeeds with the
|
||||
toolchain used although it does not contain thread support:
|
||||
|
||||
checking for mutex_lock in -lthread ... no
|
||||
checking for pthread_mutex_lock in -lpthread... no
|
||||
checking for pthread_mutex_lock in -lc... no
|
||||
checking if compiler accepts -pthread... yes
|
||||
checking for pthread_mutex_lock in -lc... no
|
||||
checking for pthread_mutex_lock in -lpthread... no
|
||||
|
||||
This positive configure check leads to
|
||||
|
||||
CFLAGS="$CFLAGS -pthread"
|
||||
|
||||
in ./configure, line 15757 which causes a compilation bug
|
||||
/home/br/br4/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.8.3/../../../../arm-buildroot-linux-uclibcgnueab
|
||||
|
||||
using this defconfig
|
||||
http://autobuild.buildroot.net/results/e86/e86e97ff7887f1bdc6bf913498392ff50f56ea88/defconfig
|
||||
|
||||
This patch disables the freebsd-only code path. Patching configure directly
|
||||
prevents the need for autoreconf.
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr unixODBC-2.3.2.org/configure unixODBC-2.3.2/configure
|
||||
--- unixODBC-2.3.2.org/configure 2013-10-08 10:56:03.000000000 +0200
|
||||
+++ unixODBC-2.3.2/configure 2015-03-13 21:19:59.210429211 +0100
|
||||
@@ -15746,7 +15746,7 @@
|
||||
|
||||
fi
|
||||
|
||||
- if test "x$gotthread" = "xno"; then
|
||||
+ if test "x$gotthread" = "xnot_needed_for_buildroot"; then
|
||||
if test "x$ac_cv_c_compiler_gnu" = "xyes"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5
|
||||
$as_echo_n "checking if compiler accepts -pthread... " >&6; }
|
||||
@@ -1,6 +1,6 @@
|
||||
# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.7.tar.gz.md5
|
||||
md5 274a711b0c77394e052db6493840c6f9 unixODBC-2.3.7.tar.gz
|
||||
# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.9.tar.gz.md5
|
||||
md5 06f76e034bb41df5233554abe961a16f unixODBC-2.3.9.tar.gz
|
||||
# Locally computed
|
||||
sha256 45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77 unixODBC-2.3.7.tar.gz
|
||||
sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING
|
||||
sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING
|
||||
sha256 52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207 unixODBC-2.3.9.tar.gz
|
||||
sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING
|
||||
sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
UNIXODBC_VERSION = 2.3.7
|
||||
UNIXODBC_VERSION = 2.3.9
|
||||
UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz
|
||||
UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC
|
||||
UNIXODBC_INSTALL_STAGING = YES
|
||||
@@ -13,6 +13,13 @@ UNIXODBC_LICENSE_FILES = COPYING exe/COPYING
|
||||
|
||||
UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEDIT),y)
|
||||
UNIXODBC_CONF_OPTS += --enable-editline
|
||||
UNIXODBC_DEPENDENCIES += libedit
|
||||
else
|
||||
UNIXODBC_CONF_OPTS += --disable-editline
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
UNIXODBC_CONF_OPTS += --enable-iconv
|
||||
UNIXODBC_DEPENDENCIES += libiconv
|
||||
@@ -34,4 +41,10 @@ else
|
||||
UNIXODBC_CONF_OPTS += --disable-readline
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
|
||||
UNIXODBC_CONF_OPTS += --enable-threads
|
||||
else
|
||||
UNIXODBC_CONF_OPTS += --disable-threads
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user