iproute2: bump to version 4.14.1
PATCH 1/1 iproute2: bump to version 4.14.1
Remove uClibc build fix; current uClibc version defines the required macro.
Remove static link fix; fixed upstream.
Rebase the musl libc-compat.h workaround to adapt to upstream headers location change.
--- ...musl-workaround-to-the-libc-compat.h-copy.patch | 16 ++-- .../iproute2/0002-Fix-build-with-uClibc-ng.patch | 38 -------- .../0003-lib-fix-multiple-strlcpy-definition.patch | 103 --------------------- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 5 files changed, 10 insertions(+), 151 deletions(-) delete mode 100644 package/iproute2/0002-Fix-build-with-uClibc-ng.patch delete mode 100644 package/iproute2/0003-lib-fix-multiple-strlcpy-definition.patch
package/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch +8 -8
@@ -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 <[email protected]> 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 <[email protected]> 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
package/iproute2/0002-Fix-build-with-uClibc-ng.patch deleted +0 -38
@@ -1,38 +0,0 @@ -From 2ac2f416072d9968a9ea2dd9f48168223a1147b0 Mon Sep 17 00:00:00 2001 -From: Baruch Siach <[email protected]> -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 <[email protected]> ---- -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 -
package/iproute2/0003-lib-fix-multiple-strlcpy-definition.patch deleted +0 -103
103 lines not on this page · raw message
package/iproute2/iproute2.hash +1 -1
@@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 iproute2-4.13.0.tar.xz +sha256 d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 iproute2-4.14.1.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
package/iproute2/iproute2.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 4.13.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 \
Signature · 1 line
2.15.0
PATCH 1/1 iproute2: bump to version 4.14.1
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Remove uClibc build fix; current uClibc version defines the required macro.
Remove static link fix; fixed upstream.
Rebase the musl
libc-compat.hworkaround to adapt to upstream headers location change.Signed-off-by Baruch Siach <[email protected]>
I see that you didn't mark this as being for next. Is that on purpose? If so, why?
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 iproute2: bump to version 4.14.1
Hi Peter,
Quoted 7 lines · Peter Korsgaard
Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Remove uClibc build fix; current uClibc version defines the required macro.
Remove static link fix; fixed upstream.
Quoted 7 lines
Quoted 4 lines
Rebase the musl
libc-compat.hworkaround to adapt to upstream headers location change.Signed-off-by Baruch Siach <[email protected]>I see that you didn't mark this as being for next. Is that on purpose? If so, why?
No purpose. I just thought it's obvious.
Would you prefer to have all patches for next marked in the subject prefix during the -rc period?
baruch
Signature · 3 lines
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -PATCH 1/1 iproute2: bump to version 4.14.1
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Baruch" == Baruch Siach <[email protected]> writes:
Hi,
Quoted 7 lines
Quoted 2 lines
I see that you didn't mark this as being for next. Is that on purpose? If so, why?
No purpose. I just thought it's obvious.
Would you prefer to have all patches for next marked in the subject prefix during the -rc period?
It is always nice to be explicit, but it isn't a big deal. I just wondered as you used next in the patch just before, but not here:
[ 96: Baruch Siach ] [PATCH next v2 1/2] gnupg2: don't preserve the old gpg2 executable name [9.7k]
[ 239: Baruch Siach ] [PATCH] iproute2: bump to version 4.14.1 [14k]
Signature · 1 line
Bye, Peter Korsgaard
Thomas Petazzoni
AppliedPATCH 1/1 iproute2: bump to version 4.14.1
In reply to Baruch SiachHello,
Quoted 9 lines · Baruch Siach
Remove uClibc build fix; current uClibc version defines the required macro.
Remove static link fix; fixed upstream.
Rebase the musl
libc-compat.hworkaround to adapt to upstream headers location change.Signed-off-by Baruch Siach <[email protected]>
Quoted 9 lines
--- ...musl-workaround-to-the-libc-compat.h-copy.patch | 16 ++-- .../iproute2/0002-Fix-build-with-uClibc-ng.patch | 38 -------- .../0003-lib-fix-multiple-strlcpy-definition.patch | 103 --------------------- package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 5 files changed, 10 insertions(+), 151 deletions(-) delete mode 100644 package/iproute2/0002-Fix-build-with-uClibc-ng.patch delete mode 100644 package/iproute2/0003-lib-fix-multiple-strlcpy-definition.patch
Applied to next, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com