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,47 +0,0 @@
|
||||
From 1d28cf070933568db8006ce45411723c5369e145 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 10 Apr 2018 19:54:50 +0200
|
||||
Subject: [PATCH] Fix compilation without pthread.h
|
||||
|
||||
Commit 7759e6f8469eb33aef1a1d5eba5d300c3a8fcb63 broke compilation on
|
||||
systems without pthread.h. So add a call to AC_CHECK_HEADERS in
|
||||
configure.ac and put include <pthread.h> under HAVE_PTHREAD_H define
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.net/results/6132f33fb282fda3c39deb292784b9006c9e7872
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
configure.ac | 1 +
|
||||
src/cap-ng.c | 2 ++
|
||||
2 files changed, 3 insertions(+)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7a99c72..4d6afee 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -56,6 +56,7 @@ AC_CHECK_HEADERS(sys/xattr.h, [], [
|
||||
AC_CHECK_HEADERS(attr/xattr.h, [], [AC_MSG_WARN(attr/xattr.h not found, disabling file system capabilities.)])
|
||||
])
|
||||
AC_CHECK_HEADERS(linux/securebits.h, [], [])
|
||||
+AC_CHECK_HEADERS(pthread.h, [], [AC_MSG_WARN(pthread.h not found, disabling pthread_atfork.)])
|
||||
|
||||
AC_C_CONST
|
||||
AC_C_INLINE
|
||||
diff --git a/src/cap-ng.c b/src/cap-ng.c
|
||||
index db647fd..240d2ba 100644
|
||||
--- a/src/cap-ng.c
|
||||
+++ b/src/cap-ng.c
|
||||
@@ -34,7 +34,9 @@
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <byteswap.h>
|
||||
+#ifdef HAVE_PTHREAD_H
|
||||
#include <pthread.h> // For pthread_atfork
|
||||
+#endif
|
||||
#ifdef HAVE_SYSCALL_H
|
||||
#include <sys/syscall.h>
|
||||
#endif
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 4a1532bcf3731aade40936f6d6a586ed5a66ca4c7455e1338d1f6c3e09221328 libcap-ng-0.7.9.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB
|
||||
sha256 f14d23b60ae1465b032e4e8cbd4112006572c69a6017d55d5d3c6aad622a9e21 libcap-ng-0.8.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB
|
||||
|
||||
@@ -4,15 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCAP_NG_VERSION = 0.7.9
|
||||
LIBCAP_NG_VERSION = 0.8
|
||||
LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng
|
||||
LIBCAP_NG_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
|
||||
LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB
|
||||
LIBCAP_NG_INSTALL_STAGING = YES
|
||||
# 0001-Fix-compilation-without-pthread.h.patch
|
||||
LIBCAP_NG_AUTORECONF = YES
|
||||
|
||||
LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no
|
||||
LIBCAP_NG_CONF_OPTS = --without-python
|
||||
|
||||
HOST_LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no
|
||||
HOST_LIBCAP_NG_CONF_OPTS = --without-python
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user