[OE-core] [PATCH 10/10] iproute2: upgrade to version 4.5.0

2016-05-03 Thread Maxin B. John 
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

Signed-off-by: Maxin B. John 
---
 .../iproute2/iproute2/iproute2-4.3.0-musl.patch| 97 +-
 .../iproute2/iproute2-fix-building-with-musl.patch | 24 --
 .../iproute2/iproute2_4.4.0.bb | 14 
 .../iproute2/iproute2_4.5.0.bb | 13 +++
 4 files changed, 50 insertions(+), 98 deletions(-)
 delete mode 100644 
meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch
 delete mode 100644 meta/recipes-connectivity/iproute2/iproute2_4.4.0.bb
 create mode 100644 meta/recipes-connectivity/iproute2/iproute2_4.5.0.bb

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
index 1b415a5..bbe0242 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch
@@ -1,64 +1,35 @@
-From 48596709d8ab59727b79a5c6db33ebb251c36543 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Thu, 19 Nov 2015 17:44:25 +0100
 Subject: [PATCH] Avoid in6_addr redefinition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
 
 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 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
-^
+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.
 
-Signed-off-by: Thomas Petazzoni 

-Upstream-Status: Pending
+(Refreshed the patch for 4.5 release)
 
- include/libiptc/ipt_kernel_headers.h | 2 --
- include/linux/if_bridge.h| 1 -
- include/linux/netfilter.h| 2 --
- include/linux/xfrm.h | 1 -
- 4 files changed, 6 deletions(-)
+Upstream-Status: Pending
 
-diff --git a/include/libiptc/ipt_kernel_headers.h 
b/include/libiptc/ipt_kernel_headers.h
-index 7e87828..9566be5 100644
 a/include/libiptc/ipt_kernel_headers.h
-+++ b/include/libiptc/ipt_kernel_headers.h
-@@ -15,12 +15,10 @@
- #else /* libc5 */
- #include 
- #include 
--#include 
- #include 
- #include 
- #include 
- #include 
- #include 
--#include 
- #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
+Signed-off-by: Thomas Petazzoni 
+Signed-off-by: Maxin B. John 
+---
+diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h 
iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h
+--- iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h   2016-03-15 
01:02:31.0 +0200
 iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h2016-03-23 
18:33:38.579062567 +0200
+@@ -6,7 +6,6 @@
+ #include 
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h 
iproute2-4.5.0/include/linux/if_bridge.h
+--- iproute2-4.5.0-orig/include/linux/if_bridge.h  2016-03-15 
01:02:31.0 +0200
 iproute2-4.5.0/include/linux/if_bridge.h   2016-03-23 18:33:58.569812648 
+0200
 @@ -15,7 +15,6 @@
  
  #include 
@@ -67,10 +38,9 @@ index ee197a3..f823aa4 100644
  
  #define SYSFS_BRIDGE_ATTR "bridge"
  #define SYSFS_BRIDGE_FDB  "brforward"
-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
+diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h 
iproute2-4.5.0/include/linux/netfilter.h
+--- iproute2-4.5.0-orig/include/linux/netfilter.h  2016-03-15 
01:02:31.0 +0200
 iproute2-4.5.0/include/linux/netfilter.h   2016-03-23 18:34:38.138317974 
+0200
 @@ -4,8 +4,6 @@
  #include 
  
@@ -80,10 +50,9 @@ index b71b4c9..3e4e6ae 100644
  
  /* Responses from hook functions. */
  #define NF_DROP 0
-diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
-index b8f5451..a9761a5 100644
 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
+--- iproute2-4.5.0-orig/include/linux/xfrm.h   2016-03-1

[OE-core] [PATCH 10/10] iproute2: upgrade to version 4.5.0

2016-05-04 Thread Maxin B. John 
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

Signed-off-by: Maxin B. John 
---
 .../iproute2/iproute2/iproute2-4.3.0-musl.patch| 97 +-
 .../iproute2/iproute2-fix-building-with-musl.patch | 24 --
 .../{iproute2_4.4.0.bb => iproute2_4.5.0.bb}   |  5 +-
 3 files changed, 39 insertions(+), 87 deletions(-)
 delete mode 100644 
meta/recipes-connectivity/iproute2/iproute2/iproute2-fix-building-with-musl.patch
 rename meta/recipes-connectivity/iproute2/{iproute2_4.4.0.bb => 
iproute2_4.5.0.bb} (63%)

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
index 1b415a5..bbe0242 100644
--- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch
+++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch
@@ -1,64 +1,35 @@
-From 48596709d8ab59727b79a5c6db33ebb251c36543 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni 
-Date: Thu, 19 Nov 2015 17:44:25 +0100
 Subject: [PATCH] Avoid in6_addr redefinition
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
 
 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 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
-^
+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.
 
-Signed-off-by: Thomas Petazzoni 

-Upstream-Status: Pending
+(Refreshed the patch for 4.5 release)
 
- include/libiptc/ipt_kernel_headers.h | 2 --
- include/linux/if_bridge.h| 1 -
- include/linux/netfilter.h| 2 --
- include/linux/xfrm.h | 1 -
- 4 files changed, 6 deletions(-)
+Upstream-Status: Pending
 
-diff --git a/include/libiptc/ipt_kernel_headers.h 
b/include/libiptc/ipt_kernel_headers.h
-index 7e87828..9566be5 100644
 a/include/libiptc/ipt_kernel_headers.h
-+++ b/include/libiptc/ipt_kernel_headers.h
-@@ -15,12 +15,10 @@
- #else /* libc5 */
- #include 
- #include 
--#include 
- #include 
- #include 
- #include 
- #include 
- #include 
--#include 
- #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
+Signed-off-by: Thomas Petazzoni 
+Signed-off-by: Maxin B. John 
+---
+diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h 
iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h
+--- iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h   2016-03-15 
01:02:31.0 +0200
 iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h2016-03-23 
18:33:38.579062567 +0200
+@@ -6,7 +6,6 @@
+ #include 
+ 
+ #include 
+-#include 
+ #include 
+ #include 
+ #include 
+diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h 
iproute2-4.5.0/include/linux/if_bridge.h
+--- iproute2-4.5.0-orig/include/linux/if_bridge.h  2016-03-15 
01:02:31.0 +0200
 iproute2-4.5.0/include/linux/if_bridge.h   2016-03-23 18:33:58.569812648 
+0200
 @@ -15,7 +15,6 @@
  
  #include 
@@ -67,10 +38,9 @@ index ee197a3..f823aa4 100644
  
  #define SYSFS_BRIDGE_ATTR "bridge"
  #define SYSFS_BRIDGE_FDB  "brforward"
-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
+diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h 
iproute2-4.5.0/include/linux/netfilter.h
+--- iproute2-4.5.0-orig/include/linux/netfilter.h  2016-03-15 
01:02:31.0 +0200
 iproute2-4.5.0/include/linux/netfilter.h   2016-03-23 18:34:38.138317974 
+0200
 @@ -4,8 +4,6 @@
  #include 
  
@@ -80,10 +50,9 @@ index b71b4c9..3e4e6ae 100644
  
  /* Responses from hook functions. */
  #define NF_DROP 0
-diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
-index b8f5451..a9761a5 100644
 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
+--- iproute2-4.5.0-orig/include/linux/xfrm.h   2016-03-15 01:02:31.0 
+0200
 iproute2-4.5.0/include/linux/xfrm.h2016-03-23 18:34:57.539075431 
+0200
 @@ -1,7