From patchwork Wed Jul 19 18:43:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 791193 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xCQt00KsMz9sxR for ; Thu, 20 Jul 2017 04:44:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 64DB287B43; Wed, 19 Jul 2017 18:44:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FL18qZNKP20k; Wed, 19 Jul 2017 18:44:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8FBA187B36; Wed, 19 Jul 2017 18:44:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 88C0A1C01F1 for ; Wed, 19 Jul 2017 18:44:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 82D5488500 for ; Wed, 19 Jul 2017 18:44:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id g5pYkvPMYvHJ for ; Wed, 19 Jul 2017 18:44:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 652EC88507 for ; Wed, 19 Jul 2017 18:44:00 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 4FD0E44065C; Wed, 19 Jul 2017 21:43:58 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Wed, 19 Jul 2017 21:43:50 +0300 Message-Id: X-Mailer: git-send-email 2.13.2 In-Reply-To: <7d39adcfed0fa70634aa025114ed8f2d7d9e68b3.1500489830.git.baruch@tkos.co.il> References: <7d39adcfed0fa70634aa025114ed8f2d7d9e68b3.1500489830.git.baruch@tkos.co.il> Subject: [Buildroot] [PATCH v2 2/2] iproute2: bump to version 4.12.0 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop upstream patch. Add uClibc-ng compatibility fix. This is needed due to missing definition in netinet/in.h. Add license file hash. Cc: Waldemar Brodkorb Signed-off-by: Baruch Siach --- .../iproute2/0002-Fix-build-with-uClibc-ng.patch | 38 ++++++++++++++++++++++ .../0002-ip-include-libc-headers-first.patch | 35 -------------------- package/iproute2/iproute2.hash | 3 +- package/iproute2/iproute2.mk | 2 +- 4 files changed, 41 insertions(+), 37 deletions(-) create mode 100644 package/iproute2/0002-Fix-build-with-uClibc-ng.patch delete mode 100644 package/iproute2/0002-ip-include-libc-headers-first.patch diff --git a/package/iproute2/0002-Fix-build-with-uClibc-ng.patch b/package/iproute2/0002-Fix-build-with-uClibc-ng.patch new file mode 100644 index 000000000000..48cae701438e --- /dev/null +++ b/package/iproute2/0002-Fix-build-with-uClibc-ng.patch @@ -0,0 +1,38 @@ +From 2ac2f416072d9968a9ea2dd9f48168223a1147b0 Mon Sep 17 00:00:00 2001 +From: Baruch Siach +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 +--- +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 + #include + ++#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 + diff --git a/package/iproute2/0002-ip-include-libc-headers-first.patch b/package/iproute2/0002-ip-include-libc-headers-first.patch deleted file mode 100644 index b8421424437b..000000000000 --- a/package/iproute2/0002-ip-include-libc-headers-first.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8afdd8babb9e82bcfde78e851b24b698436a6f9f Mon Sep 17 00:00:00 2001 -Message-Id: <8afdd8babb9e82bcfde78e851b24b698436a6f9f.1495466847.git.baruch@tkos.co.il> -From: Baruch Siach -Date: Mon, 22 May 2017 15:42:49 +0300 -Subject: [PATCH] ip: include libc headers first - -Including libc headers first helps as a workaround to redefinition of struct -ethhdr with a suitably patched musl libc that suppresses the kernel -if_ether.h. - -Signed-off-by: Baruch Siach ---- -Upstream status: posted http://marc.info/?l=linux-netdev&m=149545968900803&w=2 - - ip/iplink_bridge.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c -index 818b43c89b5b..cccdec1c203a 100644 ---- a/ip/iplink_bridge.c -+++ b/ip/iplink_bridge.c -@@ -13,9 +13,9 @@ - #include - #include - #include -+#include - #include - #include --#include - #include - - #include "rt_names.h" --- -2.11.0 - diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 5bc47d8da4ff..ace94b1d7521 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,2 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 iproute2-4.11.0.tar.xz +sha256 2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d iproute2-4.12.0.tar.xz +sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index a9ca376717d6..1dc7abe3d64a 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 4.11.0 +IPROUTE2_VERSION = 4.12.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 \