Bump buildroot to 2019.02
This commit is contained in:
@@ -1,38 +0,0 @@
|
||||
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
|
||||
|
||||
The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and
|
||||
__USE_MISC) to solve conflicts with libc provided headers. This patch makes
|
||||
libc-compat.h work also for musl libc.
|
||||
|
||||
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/uapi/linux/libc-compat.h | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
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... */
|
||||
-#if defined(__GLIBC__)
|
||||
+#if 1
|
||||
+#define __USE_MISC
|
||||
|
||||
/* Coordinate with glibc net/if.h header. */
|
||||
#if defined(_NET_IF_H) && defined(__USE_MISC)
|
||||
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
|
||||
|
||||
/* GLIBC headers included first so don't define anything
|
||||
* that would already be defined. */
|
||||
--
|
||||
2.15.0
|
||||
|
||||
@@ -0,0 +1,32 @@
|
||||
From 950bf78adc9a3290ed383eaeef01dee6543cfb97 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Korsgaard <peter@korsgaard.com>
|
||||
Date: Sat, 27 Oct 2018 17:25:31 +0200
|
||||
Subject: [PATCH] utils.h: provide fallback CLOCK_TAI definition
|
||||
|
||||
q_{etf,taprio}.c uses CLOCK_TAI, which isn't exposed by glibc < 2.21 or
|
||||
uClibc, breaking the build. Provide a fallback definition like it is done
|
||||
for IPPROTO_MPLS and others.
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
include/utils.h | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/include/utils.h b/include/utils.h
|
||||
index 258d630e..685d2c1d 100644
|
||||
--- a/include/utils.h
|
||||
+++ b/include/utils.h
|
||||
@@ -126,6 +126,10 @@ struct ipx_addr {
|
||||
#define IPPROTO_MPLS 137
|
||||
#endif
|
||||
|
||||
+#ifndef CLOCK_TAI
|
||||
+# define CLOCK_TAI 11
|
||||
+#endif
|
||||
+
|
||||
__u32 get_addr32(const char *name);
|
||||
int get_addr_1(inet_prefix *dst, const char *arg, int family);
|
||||
int get_prefix_1(inet_prefix *dst, char *arg, int family);
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 9700927a008a803ac119bdf816bdc1baa69d705c Mon Sep 17 00:00:00 2001
|
||||
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
Date: Wed, 20 Feb 2019 15:41:51 +0100
|
||||
Subject: [PATCH] ss: fix compilation under glibc < 2.18
|
||||
|
||||
Commit c759116a0b2b6da8df9687b0a40ac69050132c77 introduced support for
|
||||
AF_VSOCK. This define is only provided since glibc version 2.18, so
|
||||
compilation fails when using older toolchains.
|
||||
|
||||
Provide the necessary definitions if needed.
|
||||
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||
---
|
||||
misc/ss.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/misc/ss.c b/misc/ss.c
|
||||
index 9e821faf..766fdc5f 100644
|
||||
--- a/misc/ss.c
|
||||
+++ b/misc/ss.c
|
||||
@@ -51,6 +51,14 @@
|
||||
#include <linux/tipc_netlink.h>
|
||||
#include <linux/tipc_sockets_diag.h>
|
||||
|
||||
+/* AF_VSOCK/PF_VSOCK is only provided since glibc 2.18 */
|
||||
+#ifndef PF_VSOCK
|
||||
+#define PF_VSOCK 40
|
||||
+#endif
|
||||
+#ifndef AF_VSOCK
|
||||
+#define AF_VSOCK PF_VSOCK
|
||||
+#endif
|
||||
+
|
||||
#define MAGIC_SEQ 123456
|
||||
#define BUF_CHUNK (1024 * 1024)
|
||||
#define LEN_ALIGN(x) (((x) + 1) & ~1)
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc
|
||||
sha256 d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 iproute2-4.14.1.tar.xz
|
||||
sha256 d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984 iproute2-4.19.0.tar.xz
|
||||
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IPROUTE2_VERSION = 4.14.1
|
||||
IPROUTE2_VERSION = 4.19.0
|
||||
IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz
|
||||
IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2
|
||||
IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
|
||||
@@ -12,67 +12,38 @@ IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \
|
||||
IPROUTE2_LICENSE = GPL-2.0+
|
||||
IPROUTE2_LICENSE_FILES = COPYING
|
||||
|
||||
# If both iproute2 and busybox are selected, make certain we win
|
||||
# the fight over who gets to have their utils actually installed.
|
||||
ifeq ($(BR2_PACKAGE_BUSYBOX),y)
|
||||
IPROUTE2_DEPENDENCIES += busybox
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ELFUTILS),y)
|
||||
IPROUTE2_DEPENDENCIES += elfutils
|
||||
endif
|
||||
|
||||
# If we've got iptables enable xtables support for tc
|
||||
ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx)
|
||||
IPROUTE2_DEPENDENCIES += iptables
|
||||
define IPROUTE2_WITH_IPTABLES
|
||||
# Makefile is busted so it never passes IPT_LIB_DIR properly
|
||||
$(SED) "s/-DIPT/-DXT/" $(@D)/tc/Makefile
|
||||
endef
|
||||
else
|
||||
define IPROUTE2_WITH_IPTABLES
|
||||
define IPROUTE2_DISABLE_IPTABLES
|
||||
# m_xt.so is built unconditionally
|
||||
echo "TC_CONFIG_XT:=n" >>$(@D)/config.mk
|
||||
endef
|
||||
endif
|
||||
|
||||
# arpd needs BerkeleyDB and links against pthread
|
||||
ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185),y)
|
||||
IPROUTE2_DEPENDENCIES += berkeleydb
|
||||
else
|
||||
define IPROUTE2_DISABLE_ARPD
|
||||
echo "HAVE_BERKELEY_DB:=n" >> $(@D)/config.mk
|
||||
endef
|
||||
endif
|
||||
|
||||
# ifcfg needs bash
|
||||
ifeq ($(BR2_PACKAGE_BASH),)
|
||||
define IPROUTE2_REMOVE_IFCFG
|
||||
rm -f $(TARGET_DIR)/sbin/ifcfg
|
||||
endef
|
||||
endif
|
||||
|
||||
define IPROUTE2_CONFIGURE_CMDS
|
||||
$(SED) 's/gcc/$$CC $$CFLAGS/g' $(@D)/configure
|
||||
cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure
|
||||
$(IPROUTE2_DISABLE_ARPD)
|
||||
$(IPROUTE2_WITH_IPTABLES)
|
||||
$(IPROUTE2_DISABLE_IPTABLES)
|
||||
endef
|
||||
|
||||
define IPROUTE2_BUILD_CMDS
|
||||
$(SED) 's/$$(CCOPTS)//' $(@D)/netem/Makefile
|
||||
$(TARGET_MAKE_ENV) LDFLAGS="$(TARGET_LDFLAGS)" $(MAKE) \
|
||||
$(TARGET_MAKE_ENV) LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
CFLAGS="$(TARGET_CFLAGS) -DXT_LIB_DIR=\\\"/usr/lib/xtables\\\"" \
|
||||
CBUILD_CFLAGS="$(HOST_CFLAGS)" $(MAKE) V=1 LIBDB_LIBS=-lpthread \
|
||||
DBM_INCLUDE="$(STAGING_DIR)/usr/include" \
|
||||
CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
|
||||
SHARED_LIBS="$(if $(BR2_STATIC_LIBS),n,y)" -C $(@D)
|
||||
endef
|
||||
|
||||
define IPROUTE2_INSTALL_TARGET_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" \
|
||||
SBINDIR=/sbin \
|
||||
DOCDIR=/usr/share/doc/iproute2-$(IPROUTE2_VERSION) \
|
||||
MANDIR=/usr/share/man install
|
||||
$(IPROUTE2_REMOVE_IFCFG)
|
||||
$(TARGET_MAKE_ENV) DESTDIR="$(TARGET_DIR)" $(MAKE) -C $(@D) install
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user