Bump buildroot to 2019.02
This commit is contained in:
@@ -1,69 +0,0 @@
|
||||
From b583c5d3b4cc2c54c68eef5eb7855ecfacee8bfc Mon Sep 17 00:00:00 2001
|
||||
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
Date: Sat, 6 Jan 2018 23:32:52 +0100
|
||||
Subject: [PATCH] add additional uapi guards for Linux kernel header files
|
||||
|
||||
With Linux kernel 4.16 it will be possible to guard more parts of the
|
||||
Linux header files from a libc. Make use of this in musl to guard all
|
||||
the structures and other definitions from the Linux header files which
|
||||
are also defined by the header files provided by musl. This will make
|
||||
it possible to compile source files which include both the libc
|
||||
headers and the kernel userspace headers.
|
||||
|
||||
This extends the definitions done in commit 04983f227238 ("make
|
||||
netinet/in.h suppress clashing definitions from kernel headers")
|
||||
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Patch status: upstream commit b583c5d3b4cc
|
||||
|
||||
include/net/if.h | 7 +++++++
|
||||
include/netinet/if_ether.h | 1 +
|
||||
include/sys/xattr.h | 2 ++
|
||||
3 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/include/net/if.h b/include/net/if.h
|
||||
index 2f2fcc10e484..774cbff0b506 100644
|
||||
--- a/include/net/if.h
|
||||
+++ b/include/net/if.h
|
||||
@@ -125,6 +125,13 @@ struct ifconf {
|
||||
#define ifc_req ifc_ifcu.ifcu_req
|
||||
#define _IOT_ifconf _IOT(_IOTS(struct ifconf),1,0,0,0,0)
|
||||
|
||||
+#define __UAPI_DEF_IF_IFCONF 0
|
||||
+#define __UAPI_DEF_IF_IFMAP 0
|
||||
+#define __UAPI_DEF_IF_IFNAMSIZ 0
|
||||
+#define __UAPI_DEF_IF_IFREQ 0
|
||||
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
|
||||
+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
|
||||
+
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h
|
||||
index d9a131aa2d1d..97134d75b480 100644
|
||||
--- a/include/netinet/if_ether.h
|
||||
+++ b/include/netinet/if_ether.h
|
||||
@@ -133,5 +133,6 @@ do { \
|
||||
(enaddr)[5] = ((uint8_t *)ipaddr)[3]; \
|
||||
} while(0)
|
||||
|
||||
+#define __UAPI_DEF_ETHHDR 0
|
||||
|
||||
#endif
|
||||
diff --git a/include/sys/xattr.h b/include/sys/xattr.h
|
||||
index 6479fcc62e5f..eeeaafc44f09 100644
|
||||
--- a/include/sys/xattr.h
|
||||
+++ b/include/sys/xattr.h
|
||||
@@ -24,6 +24,8 @@ int removexattr(const char *, const char *);
|
||||
int lremovexattr(const char *, const char *);
|
||||
int fremovexattr(int, const char *);
|
||||
|
||||
+#define __UAPI_DEF_XATTR 0
|
||||
+
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
--
|
||||
2.15.1
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
# Locally calculated after checking pgp signature from
|
||||
# http://www.musl-libc.org/releases/musl-1.1.18.tar.gz.asc
|
||||
sha256 d017ee5d01aec0c522a1330fdff06b1e428cb409e1db819cc4935d5da4a5a118 musl-1.1.18.tar.gz
|
||||
# http://www.musl-libc.org/releases/musl-1.1.21.tar.gz.asc
|
||||
sha256 c742b66f6f49c9e5f52f64d8b79fecb5a0f6e0203fca176c70ca20f6be285f44 musl-1.1.21.tar.gz
|
||||
sha256 a3ae1b9fc5d4938f5734734383b9813d27a5652df23010c6f9d4c5419b239a41 COPYRIGHT
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MUSL_VERSION = 1.1.18
|
||||
MUSL_VERSION = 1.1.21
|
||||
MUSL_SITE = http://www.musl-libc.org/releases
|
||||
MUSL_LICENSE = MIT
|
||||
MUSL_LICENSE_FILES = COPYRIGHT
|
||||
|
||||
Reference in New Issue
Block a user