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,62 +0,0 @@
|
||||
From dea6cfba122439b29cdcb833a59868dd51a4eae4 Mon Sep 17 00:00:00 2001
|
||||
From: Quentin Armitage <quentin@armitage.org.uk>
|
||||
Date: Mon, 13 May 2019 14:25:26 +0100
|
||||
Subject: [PATCH] Ensure that -lm linker library flag is always set
|
||||
|
||||
configure was testing whether it was necessary to add the -lm option,
|
||||
but for some reason gcc adds it itself if -Os is not specified, but
|
||||
does not add it if -Os is specified. Consequently if configure was
|
||||
run without -Os, and make was run with -Os the link failed.
|
||||
|
||||
The commit ensures that -lm is always used.
|
||||
|
||||
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/acassen/keepalived/commit/dea6cfba122439b29cdcb833a59868dd51a4eae4]
|
||||
---
|
||||
configure.ac | 24 +++---------------------
|
||||
1 file changed, 3 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5023900f4..ae420d5a6 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -340,6 +340,9 @@ WARNINGS_EXTRA="aggregate-return conversion padded pedantic sign-conversion stri
|
||||
# We want _GNU_SOURCE defined always
|
||||
add_to_var([CFLAGS], [-D_GNU_SOURCE])
|
||||
|
||||
+# fpclassify() needs -lm
|
||||
+add_to_var([KA_LIBS], [-lm])
|
||||
+
|
||||
# Some sanity checks on configure options
|
||||
AS_IF([test .$enable_vrrp = .no],
|
||||
[
|
||||
@@ -779,27 +782,6 @@ AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||
LDFLAGS=$SAV_LDFLAGS
|
||||
])
|
||||
|
||||
-# Check if fpclassify() requires -lm
|
||||
-CFLAGS=
|
||||
-LDFLAGS=
|
||||
-AC_MSG_CHECKING([whether fpclassify() requires -lm])
|
||||
-AC_LINK_IFELSE([AC_LANG_SOURCE([[
|
||||
- # include <math.h>
|
||||
- int main(int argc, char **argv)
|
||||
- {
|
||||
- double zero = 0.0;
|
||||
- if (fpclassify(zero) == FP_ZERO)
|
||||
- return 0;
|
||||
- return 1;
|
||||
- }
|
||||
- ]])],
|
||||
- AC_MSG_RESULT([no]),
|
||||
- AC_MSG_RESULT([yes])
|
||||
- add_to_var([KA_LIBS], [-lm])
|
||||
- )
|
||||
-CFLAGS=$SAV_CFLAGS
|
||||
-LDFLAGS=$SAV_LDFLAGS
|
||||
-
|
||||
# Checks for header files.
|
||||
AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/prctl.h sys/socket.h sys/time.h syslog.h unistd.h],
|
||||
[], [AC_MSG_ERROR([Missing/unusable system header file <$ac_header>])])
|
||||
@@ -2,7 +2,6 @@ config BR2_PACKAGE_KEEPALIVED
|
||||
bool "keepalived"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_STATIC_LIBS # uses libdl
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
help
|
||||
The main goal of the keepalived project is to add a strong &
|
||||
@@ -15,6 +14,6 @@ config BR2_PACKAGE_KEEPALIVED
|
||||
|
||||
http://www.keepalived.org/
|
||||
|
||||
comment "keepalived needs a toolchain w/ dynamic library, headers >= 3.4"
|
||||
comment "keepalived needs a toolchain w/ dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 933ee01bc6346aa573453b998f87510d3cce4aba4537c9642b24e6dbfba5c6f4 keepalived-2.0.15.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 245bf399e4320064996ac5507236a8896f545d005f6c4c3b91701bcbc5728c60 keepalived-2.1.4.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
||||
@@ -4,14 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KEEPALIVED_VERSION = 2.0.15
|
||||
KEEPALIVED_VERSION = 2.1.4
|
||||
KEEPALIVED_SITE = http://www.keepalived.org/software
|
||||
KEEPALIVED_DEPENDENCIES = host-pkgconf openssl
|
||||
KEEPALIVED_LICENSE = GPL-2.0+
|
||||
KEEPALIVED_LICENSE_FILES = COPYING
|
||||
KEEPALIVED_CONF_OPTS = --disable-hardening
|
||||
# We're patching configure.ac
|
||||
KEEPALIVED_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JSON_C),y)
|
||||
KEEPALIVED_DEPENDENCIES += json-c
|
||||
@@ -34,18 +32,18 @@ else
|
||||
KEEPALIVED_CONF_OPTS += --disable-libnl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_IPTABLES),y)
|
||||
KEEPALIVED_DEPENDENCIES += iptables
|
||||
KEEPALIVED_CONF_OPTS += --enable-iptables
|
||||
# ipset support only makes sense when iptables support is enabled.
|
||||
ifeq ($(BR2_PACKAGE_IPSET),y)
|
||||
KEEPALIVED_DEPENDENCIES += ipset
|
||||
KEEPALIVED_CONF_OPTS += --enable-libipset
|
||||
else
|
||||
KEEPALIVED_CONF_OPTS += --disable-libipset
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_IPTABLES),y)
|
||||
KEEPALIVED_DEPENDENCIES += iptables
|
||||
KEEPALIVED_CONF_OPTS += --enable-libiptc
|
||||
else
|
||||
KEEPALIVED_CONF_OPTS += --disable-libiptc
|
||||
KEEPALIVED_CONF_OPTS += --disable-iptables
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBNFTNL),y)
|
||||
|
||||
Reference in New Issue
Block a user