diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
commit | 1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch) | |
tree | dd26d5bc619271f8cccf0c9d7abdda9a1749d13f /package/iproute2/0002-Fix-build-with-uClibc-ng.patch | |
parent | 57dcad243e6daefefbe21109e1fc97272053a7a0 (diff) | |
parent | 787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff) | |
download | buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.tar.gz buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.zip |
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release
cycle back into the master branch.
A few conflicts had to be resolved:
- In the DEVELOPERS file, because Fabrice Fontaine was added as a
developer for libupnp in master, and for libupnp18 in
next. Resolution is simple: add him for both.
- linux/Config.in, because we updated the 4.13.x release used by
default in master, while we moved to 4.14 in next. Resolution: use
4.14.
- package/libupnp/libupnp.hash: a hash for the license file was added
in master, while the package was bumped into next. Resolution: keep
the hash for the license file, and keep the hash for the newest
version of libupnp.
- package/linux-headers/Config.in.host: default version of the kernel
headers for 4.13 was bumped to the latest 4.13.x in master, but was
changed to 4.14 in next. Resolution: use 4.14.
- package/samba4/: samba was bumped to 4.6.11 in master for security
reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/iproute2/0002-Fix-build-with-uClibc-ng.patch')
-rw-r--r-- | package/iproute2/0002-Fix-build-with-uClibc-ng.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/package/iproute2/0002-Fix-build-with-uClibc-ng.patch b/package/iproute2/0002-Fix-build-with-uClibc-ng.patch deleted file mode 100644 index 48cae70143..0000000000 --- a/package/iproute2/0002-Fix-build-with-uClibc-ng.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2ac2f416072d9968a9ea2dd9f48168223a1147b0 Mon Sep 17 00:00:00 2001 -From: Baruch Siach <baruch@tkos.co.il> -Date: Tue, 18 Jul 2017 14:09:06 +0300 -Subject: [PATCH] Fix build with uClibc-ng - -Add a local definition for IPPROTO_MH to fix build with uClibc-ng. As of -version 1.0.25, the uClibc-ng netinet/in.h header does not provide this -definition. The kernel provided definition is masked by libc-compat.h. Add -this local fix until uClibc-ng syncs netinet/in.h with glibc. - -This partially reverts upstream commit a9ae195a2169 (xfrm: get #define's from -linux includes) - -Signed-off-by: Baruch Siach <baruch@tkos.co.il> ---- -Upstream status: non upstreamable; local uClibc-ng compatibility fix ---- - ip/xfrm.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ip/xfrm.h b/ip/xfrm.h -index 54d80ce5e949..50b85550fb45 100644 ---- a/ip/xfrm.h -+++ b/ip/xfrm.h -@@ -30,6 +30,10 @@ - #include <linux/xfrm.h> - #include <linux/ipsec.h> - -+#ifndef IPPROTO_MH -+# define IPPROTO_MH 135 -+#endif -+ - #define XFRMS_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_info)))) - #define XFRMS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_info)) - --- -2.13.2 - |