rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to 2019.02

Browse Source
This commit is contained in:
NADAL Jean-Baptiste
2019-03-28 22:49:48 +01:00
parent 5598b1b762
commit 920d307141
5121 changed files with 78550 additions and 46132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
bsp/buildroot/package/keepalived/0001-Fix-build-with-Linux-kernel-headers-v4.15.patch
View File

@@ -1,59 +0,0 @@
From 15f93dd90484532e25c8f3e43fb34a361a79d7f2 Mon Sep 17 00:00:00 2001
From: Baruch Siach <baruch@tkos.co.il>
Date: Fri, 9 Feb 2018 11:55:19 +0200
Subject: [PATCH] Fix build with Linux kernel headers v4.15
Linux kernel version 4.15 changed the libc/kernel headers suppression
logic in a way that introduces collisions:
In file included from ./../include/vrrp_ipaddress.h:32:0,
from ./../include/vrrp_arp.h:31,
from vrrp.c:29:
/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/linux/in.h:29:3: error: redeclaration of enumerator 'IPPROTO_IP'
IPPROTO_IP = 0, /* Dummy protocol for TCP */
^
/home/peko/autobuild/instance-1/output/host/arc-buildroot-linux-uclibc/sysroot/usr/include/netinet/in.h:33:5: note: previous definition of 'IPPROTO_IP' was here
IPPROTO_IP = 0, /* Dummy protocol for TCP. */
^~~~~~~~~~
Include the libc netinet/in.h header first to suppress the kernel
header.
In addition, add _GNU_SOURCE to vrrp.c for the libc provided in6_pktinfo
definition.
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
Upstream status: https://github.com/acassen/keepalived/pull/777
keepalived/include/vrrp_arp.h | 1 +
keepalived/vrrp/vrrp.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/keepalived/include/vrrp_arp.h b/keepalived/include/vrrp_arp.h
index 77a26c450b12..a103ab075c1d 100644
--- a/keepalived/include/vrrp_arp.h
+++ b/keepalived/include/vrrp_arp.h
@@ -24,6 +24,7 @@
#define _VRRP_ARP_H
/* system includes */
+#include <netinet/in.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
diff --git a/keepalived/vrrp/vrrp.c b/keepalived/vrrp/vrrp.c
index 3d2bfe41ab4f..435a4b54b2a9 100644
--- a/keepalived/vrrp/vrrp.c
+++ b/keepalived/vrrp/vrrp.c
@@ -26,6 +26,7 @@
#include "config.h"
/* local include */
+#define _GNU_SOURCE
#include "vrrp_arp.h"
#include "vrrp_ndisc.h"
#include "vrrp_scheduler.h"
--
2.15.1

61
bsp/buildroot/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch Normal file
View File

@@ -0,0 +1,61 @@
From 7d4856e213f349bcd97b3644b01d6170b226de16 Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Tue, 20 Nov 2018 17:24:58 +0000
Subject: [PATCH] Rename TIMER_MAX to TIMER_MAXIMUM
ulibC defines TIMER_MAX, so to avoid naming conflict rename it.
This issue was reported by Paul Gildea <gildeap@tcd.ie> who also
provided the patch.
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/7d4856e213f349bcd97b3644b01d6170b226de16]
---
lib/parser.c | 8 ++++----
lib/parser.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/parser.c b/lib/parser.c
index 1d53595c0..cc9b644e2 100644
--- a/lib/parser.c
+++ b/lib/parser.c
@@ -1915,20 +1915,20 @@ read_timer(vector_t *strvec, size_t index, unsigned long *res, unsigned long min
#endif
if (!max_time)
- max_time = TIMER_MAX;
+ max_time = TIMER_MAXIMUM;
errno = 0;
timer = strtoul(vector_slot(strvec, index), &endptr, 10);
- *res = (timer > TIMER_MAX ? TIMER_MAX : timer) * TIMER_HZ;
+ *res = (timer > TIMER_MAXIMUM ? TIMER_MAXIMUM : timer) * TIMER_HZ;
if (FMT_STR_VSLOT(strvec, index)[0] == '-')
report_config_error(CONFIG_INVALID_NUMBER, "%snegative number '%s'", warn, FMT_STR_VSLOT(strvec, index));
else if (*endptr)
report_config_error(CONFIG_INVALID_NUMBER, "%sinvalid number '%s'", warn, FMT_STR_VSLOT(strvec, index));
- else if (errno == ERANGE || timer > TIMER_MAX)
+ else if (errno == ERANGE || timer > TIMER_MAXIMUM)
report_config_error(CONFIG_INVALID_NUMBER, "%snumber '%s' outside timer range", warn, FMT_STR_VSLOT(strvec, index));
else if (timer < min_time || timer > max_time)
- report_config_error(CONFIG_INVALID_NUMBER, "number '%s' outside range [%ld, %ld]", FMT_STR_VSLOT(strvec, index), min_time, max_time ? max_time : TIMER_MAX);
+ report_config_error(CONFIG_INVALID_NUMBER, "number '%s' outside range [%ld, %ld]", FMT_STR_VSLOT(strvec, index), min_time, max_time ? max_time : TIMER_MAXIMUM);
else
return true;
diff --git a/lib/parser.h b/lib/parser.h
index 88a74474a..291aa8ffe 100644
--- a/lib/parser.h
+++ b/lib/parser.h
@@ -38,7 +38,7 @@
#define MAXBUF 1024
/* Maximum time read_timer can return */
-#define TIMER_MAX (ULONG_MAX / TIMER_HZ)
+#define TIMER_MAXIMUM (ULONG_MAX / TIMER_HZ)
/* Configuration test errors. These should be in decreasing order of severity */
typedef enum {

38
bsp/buildroot/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch Normal file
View File

@@ -0,0 +1,38 @@
From e4dd33f16fe56d09c8d59d1254a4ed1d8e9bb29c Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Thu, 6 Dec 2018 12:16:08 +0000
Subject: [PATCH] Fix order of include files in configure COLLISION test
Since Linux 4.4.11 (commit 1575c09) including linux/if.h after
net/if.h works, whereas until glibc fix their headers including
net/if.h after linux/if.h causes compiler redefinition errors.
Unfortunately the test for the collision was done the wrong way
round, as identified in issue #1079. The patch included in the
issue report corrects the order of inclusion of the header files.
What we should do is ensure that glibc header files are included
before Linux header files, so that at least if kernel headers from
4.4.11 onwards are used, the conflict will not occur.
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/e4dd33f16fe56d09c8d59d1254a4ed1d8e9bb29c]
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 7a2e8ce1..9badcc62 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1349,8 +1349,8 @@ AC_MSG_CHECKING([for linux/if.h and net/if.h namespace collision])
SAV_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $kernelinc"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include <net/if.h>
#include <linux/if.h>
+ #include <net/if.h>
]])],
[
AC_MSG_RESULT([no])

1
bsp/buildroot/package/keepalived/Config.in
View File

@@ -4,7 +4,6 @@ config BR2_PACKAGE_KEEPALIVED
depends on !BR2_STATIC_LIBS # uses libdl
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_POPT
help
The main goal of the keepalived project is to add a strong &
robust keepalive facility to the Linux Virtual Server

3
bsp/buildroot/package/keepalived/keepalived.hash
View File

@@ -1,2 +1,3 @@
# Locally calculated
sha256 c0114d86ea4c896557beb0d9367819a423ffba772bc5d7c548dc455e6b3bd048 keepalived-1.3.5.tar.gz
sha256 40e0e55afed9ca313d621a9c5878579696fafb5504dab521aadaf20ba6e7f597 keepalived-2.0.10.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING

20
bsp/buildroot/package/keepalived/keepalived.mk
View File

@@ -4,12 +4,28 @@
#
################################################################################
KEEPALIVED_VERSION = 1.3.5
KEEPALIVED_VERSION = 2.0.10
KEEPALIVED_SITE = http://www.keepalived.org/software
KEEPALIVED_DEPENDENCIES = host-pkgconf openssl popt
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
KEEPALIVED_CONF_OPTS += --enable-json
else
KEEPALIVED_CONF_OPTS += --disable-json
endif
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
KEEPALIVED_DEPENDENCIES += libglib2
KEEPALIVED_CONF_OPTS += --enable-dbus
else
KEEPALIVED_CONF_OPTS += --disable-dbus
endif
ifeq ($(BR2_PACKAGE_LIBNL)$(BR2_PACKAGE_LIBNFNETLINK),yy)
KEEPALIVED_DEPENDENCIES += libnl libnfnetlink