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:
49
buildroot/package/openswan/0001-fix-build-with-gcc-10.patch
Normal file
49
buildroot/package/openswan/0001-fix-build-with-gcc-10.patch
Normal file
@@ -0,0 +1,49 @@
|
||||
From 3324d5ab1d00920ea46f453240da1356e0639e98 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 24 Sep 2020 21:55:31 +0200
|
||||
Subject: [PATCH] fix build with gcc 10
|
||||
|
||||
Define kw_host_list and kw_connaddrfamily_list as extern to avoid the following
|
||||
build failure with gcc 10 (which defaults to -fno-common):
|
||||
|
||||
/home/peko/autobuild/instance-1/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/10.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: initiate.o:/home/peko/autobuild/instance-1/output-1/build/openswan-2.6.51.5/include/pluto_constants.h:650: multiple definition of `kw_host_list'; connections.o:/home/peko/autobuild/instance-1/output-1/build/openswan-2.6.51.5/include/pluto_constants.h:650: first defined here
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/650fc0046fd063c70e17ce5ebd9592195657434d
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/xelerance/Openswan/pull/444]
|
||||
---
|
||||
include/ipsecconf/keywords.h | 2 +-
|
||||
include/pluto_constants.h | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/ipsecconf/keywords.h b/include/ipsecconf/keywords.h
|
||||
index e32be7968..02e8e073e 100644
|
||||
--- a/include/ipsecconf/keywords.h
|
||||
+++ b/include/ipsecconf/keywords.h
|
||||
@@ -314,7 +314,7 @@ struct config_parsed {
|
||||
bool got_default;
|
||||
};
|
||||
|
||||
-const struct keyword_enum_values kw_connaddrfamily_list;
|
||||
+extern const struct keyword_enum_values kw_connaddrfamily_list;
|
||||
|
||||
extern struct keyword_def ipsec_conf_keywords_v2[];
|
||||
extern const int ipsec_conf_keywords_v2_count;
|
||||
diff --git a/include/pluto_constants.h b/include/pluto_constants.h
|
||||
index c35dd9576..dcbd3b5b4 100644
|
||||
--- a/include/pluto_constants.h
|
||||
+++ b/include/pluto_constants.h
|
||||
@@ -665,7 +665,7 @@ enum keyword_host {
|
||||
KH_IPADDR = LOOSE_ENUM_OTHER,
|
||||
};
|
||||
/* keyword_name(&kw_host_list, type, buffer[KEYWORD_NAME_BUFLEN]) */
|
||||
-struct keyword_enum_values kw_host_list;
|
||||
+extern struct keyword_enum_values kw_host_list;
|
||||
#define KH_ISWILDCARD(type) ((type) == KH_ANY || (type) == KH_DEFAULTROUTE)
|
||||
#define KH_ISKNOWNADDR(type) ((type) == KH_IPADDR || (type)==KH_IFACE)
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
Reference in New Issue
Block a user