From c6e7db1446a4c94caf3df0b8a9758888d1b8b7f9 Mon Sep 17 00:00:00 2001 From: Zheng Ruoqin Date: Tue, 10 Jan 2017 09:59:06 +0800 Subject: iproute2 4.7->4.9 Upgrade iproute2 from 4.7 to 4.9 Signed-off-by: Zheng Ruoqin Signed-off-by: Ross Burton --- .../iproute2/iproute2/iproute2-4.3.0-musl.patch | 85 ------------- .../iproute2/iproute2/iproute2-4.9.0-musl.patch | 131 +++++++++++++++++++++ .../iproute2/iproute2_4.7.0.bb | 13 -- .../iproute2/iproute2_4.9.0.bb | 14 +++ 4 files changed, 145 insertions(+), 98 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch create mode 100644 meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb create mode 100644 meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb (limited to 'meta/recipes-connectivity/iproute2') diff --git a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch deleted file mode 100644 index 8c078f69d0..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch +++ /dev/null @@ -1,85 +0,0 @@ -Subject: [PATCH] Avoid in6_addr redefinition - -Due to both and being included, the -in6_addr is being redefined: once from the C library headers and once -from the kernel headers. This causes some build failures with for -example the musl C library. - -In order to fix this, use just the C library header . -Original patch taken from -http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. - -(Refreshed the patch for 4.6 release) - -Upstream-Status: Pending - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Maxin B. John ----- -diff -Naur iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h ---- iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:03:23.821826910 +0300 -+++ iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:04:23.714078154 +0300 -@@ -6,7 +6,6 @@ - #include - - #include --#include - #include - #include - #include -diff -Naur iproute2-4.6.0-orig/include/linux/if_bridge.h iproute2-4.6.0/include/linux/if_bridge.h ---- iproute2-4.6.0-orig/include/linux/if_bridge.h 2016-05-23 12:03:23.821826910 +0300 -+++ iproute2-4.6.0/include/linux/if_bridge.h 2016-05-23 12:04:23.716078129 +0300 -@@ -15,7 +15,6 @@ - - #include - #include --#include - - #define SYSFS_BRIDGE_ATTR "bridge" - #define SYSFS_BRIDGE_FDB "brforward" -diff -Naur iproute2-4.6.0-orig/include/linux/netfilter.h iproute2-4.6.0/include/linux/netfilter.h ---- iproute2-4.6.0-orig/include/linux/netfilter.h 2016-05-23 12:03:23.821826910 +0300 -+++ iproute2-4.6.0/include/linux/netfilter.h 2016-05-23 12:04:23.717078117 +0300 -@@ -4,8 +4,6 @@ - #include - - #include --#include --#include - - /* Responses from hook functions. */ - #define NF_DROP 0 -diff -Naur iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h ---- iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h 2016-05-18 21:56:02.000000000 +0300 -+++ iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h 2016-05-23 12:09:22.888337961 +0300 -@@ -17,7 +17,6 @@ - - #include - --#include - #include - - #include -diff -Naur iproute2-4.6.0-orig/include/linux/xfrm.h iproute2-4.6.0/include/linux/xfrm.h ---- iproute2-4.6.0-orig/include/linux/xfrm.h 2016-05-23 12:03:23.821826910 +0300 -+++ iproute2-4.6.0/include/linux/xfrm.h 2016-05-23 12:04:23.718078104 +0300 -@@ -1,7 +1,6 @@ - #ifndef _LINUX_XFRM_H - #define _LINUX_XFRM_H - --#include - #include - - /* All of the structures in this file may not change size as they are -diff -Naur iproute2-4.6.0-orig/include/utils.h iproute2-4.6.0/include/utils.h ---- iproute2-4.6.0-orig/include/utils.h 2016-05-23 12:03:23.821826910 +0300 -+++ iproute2-4.6.0/include/utils.h 2016-05-23 12:04:23.718078104 +0300 -@@ -1,6 +1,7 @@ - #ifndef __UTILS_H__ - #define __UTILS_H__ 1 - -+#include /* MAXPATHLEN */ - #include - #include - #include diff --git a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch new file mode 100644 index 0000000000..737a90c6e2 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.9.0-musl.patch @@ -0,0 +1,131 @@ +Subject: [PATCH] Avoid in6_addr redefinition + +Due to both and being included, the +in6_addr is being redefined: once from the C library headers and once +from the kernel headers. This causes some build failures with for +example the musl C library. + +In order to fix this, use just the C library header . +Original patch taken from +http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. + +(Refreshed the patch for 4.9 release) + +Upstream-Status: Pending + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Maxin B. John +Signed-off-by: Zheng Ruoqin +--- + include/libiptc/ipt_kernel_headers.h | 1 - + include/linux/if_bridge.h | 1 - + include/linux/if_tunnel.h | 2 -- + include/linux/netfilter.h | 2 -- + include/linux/netfilter_ipv4/ip_tables.h | 1 - + include/linux/xfrm.h | 1 - + include/utils.h | 1 + + ip/ip6tunnel.c | 1 - + 8 files changed, 1 insertion(+), 9 deletions(-) + +diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h +index a5963e9..42f8610 100644 +--- a/include/libiptc/ipt_kernel_headers.h ++++ b/include/libiptc/ipt_kernel_headers.h +@@ -6,7 +6,6 @@ + #include + + #include +-#include + #include + #include + #include +diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h +index b7393dd..a7028ab 100644 +--- a/include/linux/if_bridge.h ++++ b/include/linux/if_bridge.h +@@ -15,7 +15,6 @@ + + #include + #include +-#include + + #define SYSFS_BRIDGE_ATTR "bridge" + #define SYSFS_BRIDGE_FDB "brforward" +diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h +index 4f975f5..2680646 100644 +--- a/include/linux/if_tunnel.h ++++ b/include/linux/if_tunnel.h +@@ -2,9 +2,7 @@ + #define _IF_TUNNEL_H_ + + #include +-#include + #include +-#include + #include + + +diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h +index b71b4c9..3e4e6ae 100644 +--- a/include/linux/netfilter.h ++++ b/include/linux/netfilter.h +@@ -4,8 +4,6 @@ + #include + + #include +-#include +-#include + + /* Responses from hook functions. */ + #define NF_DROP 0 +diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h +index 456fb86..38542b4 100644 +--- a/include/linux/netfilter_ipv4/ip_tables.h ++++ b/include/linux/netfilter_ipv4/ip_tables.h +@@ -17,7 +17,6 @@ + + #include + +-#include + #include + + #include +diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h +index d2dd1fd..8c72966 100644 +--- a/include/linux/xfrm.h ++++ b/include/linux/xfrm.h +@@ -1,7 +1,6 @@ + #ifndef _LINUX_XFRM_H + #define _LINUX_XFRM_H + +-#include + #include + + /* All of the structures in this file may not change size as they are +diff --git a/include/utils.h b/include/utils.h +index 1b4f939..d10840b 100644 +--- a/include/utils.h ++++ b/include/utils.h +@@ -1,6 +1,7 @@ + #ifndef __UTILS_H__ + #define __UTILS_H__ 1 + ++#include /* MAXPATHLEN */ + #include + #include + #include +diff --git a/ip/ip6tunnel.c b/ip/ip6tunnel.c +index b1c0ae6..8fa4eb2 100644 +--- a/ip/ip6tunnel.c ++++ b/ip/ip6tunnel.c +@@ -28,7 +28,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.7.4 + diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb deleted file mode 100644 index 426f989160..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2_4.7.0.bb +++ /dev/null @@ -1,13 +0,0 @@ -require iproute2.inc - -SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ - file://configure-cross.patch \ - file://0001-iproute2-de-bash-scripts.patch \ - file://iproute2-4.3.0-musl.patch \ - " -SRC_URI[md5sum] = "d4b205830cdc2702f8a0cbd6232129cd" -SRC_URI[sha256sum] = "8f60dbcfb33a79daae0638f53bdcaa4310c0aa59ae39af8a234020dc69bb7b92" - -# CFLAGS are computed in Makefile and reference CCOPTS -# -EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb new file mode 100644 index 0000000000..808e5502cd --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2_4.9.0.bb @@ -0,0 +1,14 @@ +require iproute2.inc + +SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ + file://configure-cross.patch \ + file://0001-iproute2-de-bash-scripts.patch \ + file://iproute2-4.9.0-musl.patch \ + " + +SRC_URI[md5sum] = "44a8371a4b2c40e48e4c9f98cbd41391" +SRC_URI[sha256sum] = "c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4" + +# CFLAGS are computed in Makefile and reference CCOPTS +# +EXTRA_OEMAKE_append = " CCOPTS='${CFLAGS}'" -- cgit v1.2.3