Bump buidlroot version to 2018.02.6

2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
--- a/bsp/buildroot/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch
+++ b/bsp/buildroot/package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch
@@ -1,4 +1,4 @@
-From b4edb4eebbfd35934b8bc6d7ee0e00e76a01596c Mon Sep 17 00:00:00 2001
+From 909a6f10157114e09936d2dd545175d7ed84c0fb Mon Sep 17 00:00:00 2001
 From: Baruch Siach <baruch@tkos.co.il>
 Date: Thu, 22 Dec 2016 15:26:30 +0200
 Subject: [PATCH] Add the musl workaround to the libc-compat.h copy
@@ -12,14 +12,14 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
 Upstream status: libc-compat.h is a local copy of a kernel headers. A proper
 musl fix must go to the kernel first.
 ---
- include/linux/libc-compat.h | 4 +++-
+ include/uapi/linux/libc-compat.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h
-index f38571dabd8d..30f0b67c7a12 100644
--- a/include/linux/libc-compat.h
-+++ b/include/linux/libc-compat.h
-@@ -49,10 +49,12 @@
+diff --git a/include/uapi/linux/libc-compat.h b/include/uapi/linux/libc-compat.h
+index 9ab3ace08e2b..e768459d89f9 100644
+--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
+@@ -50,10 +50,12 @@
 #define _LIBC_COMPAT_H
 
 /* We have included glibc headers... */
@@ -34,5 +34,5 @@ index f38571dabd8d..30f0b67c7a12 100644
 /* GLIBC headers included first so don't define anything
  * that would already be defined. */
 -- 
-2.11.0
+2.15.0

--- a/bsp/buildroot/package/iproute2/0002-Add-missing-sys-types.h-include.patch
+++ b/bsp/buildroot/package/iproute2/0002-Add-missing-sys-types.h-include.patch
@@ -1,38 +0,0 @@
-From 560dee4b4be54699c0c9679771c9e0d61e4db80a Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 19 Nov 2015 17:48:55 +0100
-Subject: [PATCH] Add missing <sys/types.h> include
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The u_intXX_t types are defined in <sys/types.h>, so it should be
-included before using those types. Otherwise, with certain C
-libraries, the build fails with:
-
-In file included from ../include/iptables.h:4:0,
-                 from m_ipt.c:18:
-../include/iptables_common.h:47:16: error: unknown type name ‘u_int32_t’
- #define __le32 u_int32_t
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
- include/iptables_common.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/iptables_common.h b/include/iptables_common.h
-index 9099667..2c27a4b 100644
--- a/include/iptables_common.h
-+++ b/include/iptables_common.h
-@@ -43,6 +43,8 @@ extern char *lib_dir;
-   extern void init_extensions(void);
- #endif
- 
-+#include <sys/types.h>
-+
- #define __be32	u_int32_t
- #define __le32	u_int32_t
- #define __be16	u_int16_t
-- 
-2.6.3
-
--- a/bsp/buildroot/package/iproute2/0003-tc-add-missing-limits.h-header.patch
+++ b/bsp/buildroot/package/iproute2/0003-tc-add-missing-limits.h-header.patch
@@ -1,38 +0,0 @@
-From 1f4547b0a81db617f4b0d02711d9e39278eb8283 Mon Sep 17 00:00:00 2001
-From: Baruch Siach <baruch@tkos.co.il>
-Date: Thu, 22 Dec 2016 20:45:11 +0200
-Subject: [PATCH] tc: add missing limits.h header
-
-This fixes under musl build issues like:
-
-f_matchall.c: In function ‘matchall_parse_opt’:
-f_matchall.c:48:12: error: ‘LONG_MIN’ undeclared (first use in this function)
-   if (h == LONG_MIN || h == LONG_MAX) {
-            ^
-f_matchall.c:48:12: note: each undeclared identifier is reported only once for each function it appears in
-f_matchall.c:48:29: error: ‘LONG_MAX’ undeclared (first use in this function)
-   if (h == LONG_MIN || h == LONG_MAX) {
-                             ^
-
-Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
-Upstream status: posted http://marc.info/?l=linux-netdev&m=148243283002957&w=2
---
- tc/tc_util.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tc/tc_util.h b/tc/tc_util.h
-index f198a4ad5554..4db26c6d5e25 100644
--- a/tc/tc_util.h
-+++ b/tc/tc_util.h
-@@ -2,6 +2,7 @@
- #define _TC_UTIL_H_ 1
- 
- #define MAX_MSG 16384
-+#include <limits.h>
- #include <linux/pkt_sched.h>
- #include <linux/pkt_cls.h>
- #include <linux/gen_stats.h>
-- 
-2.11.0
-
--- a/bsp/buildroot/package/iproute2/Config.in
+++ b/bsp/buildroot/package/iproute2/Config.in
@@ -1,13 +1,13 @@
 config BR2_PACKAGE_IPROUTE2
 	bool "iproute2"
 	depends on BR2_USE_MMU # fork()
-	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # bpf, namespaces
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # __kernel_{u,}long_t
 	help
 	  Kernel routing and traffic control utilities. Provides things
 	  like ip and tc.

 	  http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2

-comment "iproute2 needs a toolchain w/ headers >= 3.0"
+comment "iproute2 needs a toolchain w/ headers >= 3.4"
 	depends on BR2_USE_MMU
-	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
--- a/bsp/buildroot/package/iproute2/iproute2.hash
+++ b/bsp/buildroot/package/iproute2/iproute2.hash
@@ -1,2 +1,3 @@
 # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
-sha256	c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4	iproute2-4.9.0.tar.xz
+sha256	d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067	iproute2-4.14.1.tar.xz
+sha256	e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4	COPYING
--- a/bsp/buildroot/package/iproute2/iproute2.mk
+++ b/bsp/buildroot/package/iproute2/iproute2.mk
@@ -4,12 +4,12 @@
 #
 ################################################################################

-IPROUTE2_VERSION = 4.9.0
+IPROUTE2_VERSION = 4.14.1
 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
 IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
 	$(if $(BR2_PACKAGE_LIBMNL),libmnl)
-IPROUTE2_LICENSE = GPLv2+
+IPROUTE2_LICENSE = GPL-2.0+
 IPROUTE2_LICENSE_FILES = COPYING

 # If both iproute2 and busybox are selected, make certain we win
@@ -31,9 +31,8 @@ define IPROUTE2_WITH_IPTABLES
 endef
 else
 define IPROUTE2_WITH_IPTABLES
-	# em_ipset needs xtables, but configure misdetects it
-	echo "TC_CONFIG_IPSET:=n" >>$(@D)/Config
-	echo "TC_CONFIG_XT:=n" >>$(@D)/Config
+	# m_xt.so is built unconditionally
+	echo "TC_CONFIG_XT:=n" >>$(@D)/config.mk
 endef
 endif

@@ -42,7 +41,7 @@ ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
 IPROUTE2_DEPENDENCIES += berkeleydb
 else
 define IPROUTE2_DISABLE_ARPD
-	echo "HAVE_BERKELEY_DB:=n" >> $(@D)/Config
+	echo "HAVE_BERKELEY_DB:=n" >> $(@D)/config.mk
 endef
 endif