mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

iproute2: upgrade to version 4.5.0

Browse Source 
4.4.0 -> 4.5.0

Refreshed iproute2 musl build fix patch for 4.5.0
Remove backported patch:
        iproute2-fix-building-with-musl.patch

(From OE-Core rev: 9d3d76a43d27c95aac8d7a840c9c38c686b166ec)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John
2016-05-04 11:20:24 +03:00
committed by Richard Purdie
parent cc5e129492
commit 8c1932e05e
3 changed files with 39 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch
+35 -58
View File
@@ -1,64 +1,35 @@
From 48596709d8ab59727b79a5c6db33ebb251c36543 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 19 Nov 2015 17:44:25 +0100
Subject: [PATCH] Avoid in6_addr redefinition Subject: [PATCH] Avoid in6_addr redefinition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Due to both <netinet/in.h> and <linux/in6.h> being included, the Due to both <netinet/in.h> and <linux/in6.h> being included, the
in6_addr is being redefined: once from the C library headers and once in6_addr is being redefined: once from the C library headers and once
from the kernel headers. This causes some build failures with for from the kernel headers. This causes some build failures with for
example the musl C library: example the musl C library.
In file included from ../include/linux/xfrm.h:4:0,
from xfrm.h:29,
from ipxfrm.c:39:
../include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’
struct in6_addr {
^
In file included from .../output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netdb.h:9:0,
from ipxfrm.c:34:
.../output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:24:8: note: originally defined here
struct in6_addr
^
In order to fix this, use just the C library header <netinet/in.h>. In order to fix this, use just the C library header <netinet/in.h>.
Original patch taken from Original patch taken from
http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> (Refreshed the patch for 4.5 release)
---
Upstream-Status: Pending Upstream-Status: Pending
include/libiptc/ipt_kernel_headers.h | 2 -- Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
include/linux/if_bridge.h | 1 - Signed-off-by: Maxin B. John <maxin.john@intel.com>
include/linux/netfilter.h | 2 -- ---
include/linux/xfrm.h | 1 - diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h
4 files changed, 6 deletions(-) --- iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h 2016-03-15 01:02:31.000000000 +0200
+++ iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h 2016-03-23 18:33:38.579062567 +0200
@@ -6,7 +6,6 @@
#include <limits.h>
diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h #include <netinet/ip.h>
index 7e87828..9566be5 100644 -#include <netinet/in.h>
--- a/include/libiptc/ipt_kernel_headers.h #include <netinet/ip_icmp.h>
+++ b/include/libiptc/ipt_kernel_headers.h #include <netinet/tcp.h>
@@ -15,12 +15,10 @@ #include <netinet/udp.h>
#else /* libc5 */ diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h iproute2-4.5.0/include/linux/if_bridge.h
#include <sys/socket.h> --- iproute2-4.5.0-orig/include/linux/if_bridge.h 2016-03-15 01:02:31.000000000 +0200
#include <linux/ip.h> +++ iproute2-4.5.0/include/linux/if_bridge.h 2016-03-23 18:33:58.569812648 +0200
-#include <linux/in.h>
#include <linux/if.h>
#include <linux/icmp.h>
#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/types.h>
-#include <linux/in6.h>
#endif
#endif
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
index ee197a3..f823aa4 100644
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
@@ -15,7 +15,6 @@ @@ -15,7 +15,6 @@
#include <linux/types.h> #include <linux/types.h>
@@ -67,10 +38,9 @@ index ee197a3..f823aa4 100644
#define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_ATTR "bridge"
#define SYSFS_BRIDGE_FDB "brforward" #define SYSFS_BRIDGE_FDB "brforward"
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h iproute2-4.5.0/include/linux/netfilter.h
index b71b4c9..3e4e6ae 100644 --- iproute2-4.5.0-orig/include/linux/netfilter.h 2016-03-15 01:02:31.000000000 +0200
--- a/include/linux/netfilter.h +++ iproute2-4.5.0/include/linux/netfilter.h 2016-03-23 18:34:38.138317974 +0200
+++ b/include/linux/netfilter.h
@@ -4,8 +4,6 @@ @@ -4,8 +4,6 @@
#include <linux/types.h> #include <linux/types.h>
@@ -80,10 +50,9 @@ index b71b4c9..3e4e6ae 100644
/* Responses from hook functions. */ /* Responses from hook functions. */
#define NF_DROP 0 #define NF_DROP 0
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h diff -Naur iproute2-4.5.0-orig/include/linux/xfrm.h iproute2-4.5.0/include/linux/xfrm.h
index b8f5451..a9761a5 100644 --- iproute2-4.5.0-orig/include/linux/xfrm.h 2016-03-15 01:02:31.000000000 +0200
--- a/include/linux/xfrm.h +++ iproute2-4.5.0/include/linux/xfrm.h 2016-03-23 18:34:57.539075431 +0200
+++ b/include/linux/xfrm.h
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
#ifndef _LINUX_XFRM_H #ifndef _LINUX_XFRM_H
#define _LINUX_XFRM_H #define _LINUX_XFRM_H
@@ -92,6 +61,14 @@ index b8f5451..a9761a5 100644
#include <linux/types.h> #include <linux/types.h>
/* All of the structures in this file may not change size as they are /* All of the structures in this file may not change size as they are
-- diff -Naur iproute2-4.5.0-orig/include/utils.h iproute2-4.5.0/include/utils.h
2.6.3 --- iproute2-4.5.0-orig/include/utils.h 2016-03-15 01:02:31.000000000 +0200
+++ iproute2-4.5.0/include/utils.h 2016-03-23 18:35:50.066418749 +0200
@@ -1,6 +1,7 @@
#ifndef __UTILS_H__
#define __UTILS_H__ 1
+#include <sys/param.h> /* MAXPATHLEN */
#include <sys/types.h>
#include <asm/types.h>
#include <resolv.h>
meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch
-24
View File
@@ -1,24 +0,0 @@
iproute2: fix building with musl
We need limits.h for PATH_MAX, fixes:
rt_names.c:364:13: error: ‘PATH_MAX’ undeclared (first use in this
function)
Upstream-Status: Backport
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Maxin B. John <maxin.john@intel.com>
---
diff --git a/lib/rt_names.c b/lib/rt_names.c
index f6d17c0..b665d3e 100644
--- a/lib/rt_names.c
+++ b/lib/rt_names.c
@@ -18,6 +18,7 @@
#include <sys/time.h>
#include <sys/socket.h>
#include <dirent.h>
+#include <limits.h>
#include <asm/types.h>
#include <linux/rtnetlink.h>
meta/recipes-connectivity/iproute2/iproute2_4.4.0.bb → meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb
+2 -3
View File
@@ -4,10 +4,9 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \
file://configure-cross.patch \ file://configure-cross.patch \
file://0001-iproute2-de-bash-scripts.patch \ file://0001-iproute2-de-bash-scripts.patch \
file://iproute2-4.3.0-musl.patch \ file://iproute2-4.3.0-musl.patch \
file://iproute2-fix-building-with-musl.patch \
" "
SRC_URI[md5sum] = "d762653ec3e1ab0d4a9689e169ca184f" SRC_URI[md5sum] = "b9ee1cbba7e20e04dfdd4b3055181955"
SRC_URI[sha256sum] = "bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514" SRC_URI[sha256sum] = "3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a"
# CFLAGS are computed in Makefile and reference CCOPTS # CFLAGS are computed in Makefile and reference CCOPTS
# #