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,44 @@
|
||||
From 0e0e95dbc380c5eede3a2fc1631294a98078e30f Mon Sep 17 00:00:00 2001
|
||||
From: Aymeric Moizard <amoizard@gmail.com>
|
||||
Date: Fri, 13 Mar 2020 16:34:41 +0100
|
||||
Subject: fix: fix OSIP_MONOTHREAD compilation error introduced with epoll
|
||||
implementation
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
http://git.savannah.nongnu.org/cgit/exosip.git/patch/?id=0e0e95dbc380c5eede3a2fc1631294a98078e30f]
|
||||
---
|
||||
src/eXconf.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/eXconf.c b/src/eXconf.c
|
||||
index baf90be..6165eb3 100644
|
||||
--- a/src/eXconf.c
|
||||
+++ b/src/eXconf.c
|
||||
@@ -801,12 +801,15 @@ eXosip_init (struct eXosip_t *excontext)
|
||||
}
|
||||
|
||||
if (excontext->poll_method == EXOSIP_USE_EPOLL_LT) {
|
||||
+#ifndef OSIP_MONOTHREAD
|
||||
struct epoll_event ev;
|
||||
+#endif
|
||||
excontext->epfdctl = epoll_create (1);
|
||||
if (excontext->epfdctl < 0) {
|
||||
return OSIP_UNDEFINED_ERROR;
|
||||
}
|
||||
|
||||
+#ifndef OSIP_MONOTHREAD
|
||||
memset(&ev, 0, sizeof(struct epoll_event));
|
||||
ev.events = EPOLLIN;
|
||||
ev.data.fd = jpipe_get_read_descr (excontext->j_socketctl_event);
|
||||
@@ -815,6 +818,7 @@ eXosip_init (struct eXosip_t *excontext)
|
||||
_eXosip_closesocket (excontext->epfdctl);
|
||||
return OSIP_UNDEFINED_ERROR;
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
--
|
||||
cgit v1.2.1
|
||||
|
||||
@@ -1,62 +0,0 @@
|
||||
configure: use pkg-config to find openssl
|
||||
|
||||
The current check is broken for static linking, since the openssl
|
||||
libs need to be linked against libz, which is missing in the link
|
||||
command when doing a static build:
|
||||
http://autobuild.buildroot.net/results/787/787cd9992b00d8008641af208f5fb7c4afb40b06/build-end.log
|
||||
|
||||
Instead of trying convoluted tests to decide what additional libs
|
||||
are required, just delegate this job to pkg-config.
|
||||
|
||||
At the same time, fix a few legacy, deprecated constructs in favour
|
||||
of their new counterparts.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
---
|
||||
Upstream status: submitted, but no public mailing list (sent to the
|
||||
mail documented in: http://www.antisip.com/doc/exosip2/index.html )
|
||||
|
||||
diff -durN libeXosip2-3.6.0.orig/configure.in libeXosip2-3.6.0/configure.in
|
||||
--- libeXosip2-3.6.0.orig/configure.in 2014-06-22 23:58:26.549487427 +0200
|
||||
+++ libeXosip2-3.6.0/configure.in 2014-06-22 23:59:12.822008499 +0200
|
||||
@@ -44,7 +44,7 @@
|
||||
AC_CONFIG_AUX_DIR(scripts)
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
||||
-AM_ACLOCAL_INCLUDE(scripts)
|
||||
+AC_CONFIG_MACRO_DIR([scripts])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
@@ -371,13 +371,15 @@
|
||||
|
||||
AC_ARG_ENABLE(openssl,
|
||||
[ --enable-openssl enable support for openssl],
|
||||
- enable_openssl=$enableval,enable_openssl="yes")
|
||||
+ enable_openssl=$enableval,enable_openssl="auto")
|
||||
|
||||
-if test "$enable_openssl" = "yes" ; then
|
||||
- AC_CHECK_HEADERS(openssl/ssl.h)
|
||||
- AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"])
|
||||
- AC_CHECK_LIB(crypto,X509_get_issuer_name,[EXOSIP_LIB="$EXOSIP_LIB -lcrypto"])
|
||||
-fi
|
||||
+AS_IF([test "$enable_openssl" = "yes" -o "$enable_openssl" = "auto"],
|
||||
+ [PKG_CHECK_MODULES([SSL], [openssl],
|
||||
+ [EXOSIP_LIB="$EXOSIP_LIB $SSL_LIBS"],
|
||||
+ [AS_IF([test "$enable_openssl" = "yes"],
|
||||
+ [AC_MSG_ERROR([can not find openssl])])
|
||||
+ ])
|
||||
+ ])
|
||||
|
||||
AC_ARG_ENABLE(srvrec,
|
||||
[ --enable-srvrec enable support for SRV records DNS queries (yes) ],
|
||||
diff -durN build/libeXosip2-3.6.0.orig/Makefile.am build/libeXosip2-3.6.0/Makefile.am
|
||||
--- libeXosip2-3.6.0.orig/Makefile.am 2014-06-23 00:14:25.328226745 +0200
|
||||
+++ libeXosip2-3.6.0/Makefile.am 2014-06-23 00:14:38.296371236 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-
|
||||
+ACLOCAL_AMFLAGS = -I scripts
|
||||
EXTRA_DIST = README autogen.sh
|
||||
|
||||
SUBDIRS = scripts platform src include tools help
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564 libeXosip2-3.6.0.tar.gz
|
||||
sha256 21420c00bf8e0895ff36161766beec12b7e6f1d371030c389dba845e271272e2 libexosip2-5.1.1.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBEXOSIP2_VERSION = 3.6.0
|
||||
LIBEXOSIP2_VERSION = 5.1.1
|
||||
# Since version 5.0, letter 'X' in library's name is in lower case
|
||||
LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz
|
||||
LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip
|
||||
LIBEXOSIP2_INSTALL_STAGING = YES
|
||||
LIBEXOSIP2_LICENSE = GPL-2.0+
|
||||
@@ -12,9 +14,6 @@ LIBEXOSIP2_LICENSE_FILES = COPYING
|
||||
|
||||
LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
|
||||
|
||||
# We are touching configure.in and Makefile.am with one of our patches
|
||||
LIBEXOSIP2_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_arc),y)
|
||||
# toolchain __arc__ define conflicts with libeXosip2 source
|
||||
LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
|
||||
|
||||
Reference in New Issue
Block a user