diff options
author | Changhyeok Bae <changhyeok.bae@gmail.com> | 2017-06-12 05:44:30 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-13 10:46:34 +0100 |
commit | 5c987a34a388eace954052566d6903dfe328e9e7 (patch) | |
tree | a9f949ee367499bcb53217ed3ad7a0c5b777f38a | |
parent | 248b0df1a9927191072bcc9fc3dbd4a636acb024 (diff) | |
download | poky-5c987a34a388eace954052566d6903dfe328e9e7.tar.gz |
iproute2: Upgrade 4.10.0 -> 4.11.0
0001-ip-Remove-unneed-header.patch is to fix build error
built with musl.
(From OE-Core rev: 2a6fe7c6c1e113d930ddc8e06717747a779b46f1)
Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch | 30 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_4.11.0.bb (renamed from meta/recipes-connectivity/iproute2/iproute2_4.10.0.bb) | 5 |
2 files changed, 33 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch new file mode 100644 index 0000000000..a9f8db6945 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From f58fc99c88a54135e55a6e0956ce8ae71078d1cc Mon Sep 17 00:00:00 2001 | ||
2 | From: Changhyeok Bae <changhyeok.bae@gmail.com> | ||
3 | Date: Mon, 12 Jun 2017 04:29:07 +0000 | ||
4 | Subject: [PATCH] ip: Remove unneed header | ||
5 | |||
6 | Fix redefinition of struct ethhdr with a suitably patched musl libc | ||
7 | that suppresses the kernel if_ether.h. | ||
8 | |||
9 | Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> | ||
10 | |||
11 | Upstream-Status: Submitted [netdev@vger.kernel.org] | ||
12 | --- | ||
13 | ip/iplink_bridge.c | 1 - | ||
14 | 1 file changed, 1 deletion(-) | ||
15 | |||
16 | diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c | ||
17 | index 818b43c..f065b22 100644 | ||
18 | --- a/ip/iplink_bridge.c | ||
19 | +++ b/ip/iplink_bridge.c | ||
20 | @@ -15,7 +15,6 @@ | ||
21 | #include <netinet/in.h> | ||
22 | #include <linux/if_link.h> | ||
23 | #include <linux/if_bridge.h> | ||
24 | -#include <netinet/ether.h> | ||
25 | #include <net/if.h> | ||
26 | |||
27 | #include "rt_names.h" | ||
28 | -- | ||
29 | 2.7.4 | ||
30 | |||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_4.10.0.bb b/meta/recipes-connectivity/iproute2/iproute2_4.11.0.bb index 063d467440..dbd0545436 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_4.10.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_4.11.0.bb | |||
@@ -5,10 +5,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | |||
5 | file://0001-iproute2-de-bash-scripts.patch \ | 5 | file://0001-iproute2-de-bash-scripts.patch \ |
6 | file://0001-libc-compat.h-add-musl-workaround.patch \ | 6 | file://0001-libc-compat.h-add-musl-workaround.patch \ |
7 | file://0001-include-stdint.h-explicitly-for-UINT16_MAX.patch \ | 7 | file://0001-include-stdint.h-explicitly-for-UINT16_MAX.patch \ |
8 | file://0001-ip-Remove-unneed-header.patch \ | ||
8 | " | 9 | " |
9 | 10 | ||
10 | SRC_URI[md5sum] = "b94a2b0edefaeac124dc8f5d006931b9" | 11 | SRC_URI[md5sum] = "7a9498de88bcca95c305df6108ae197e" |
11 | SRC_URI[sha256sum] = "22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8" | 12 | SRC_URI[sha256sum] = "72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026" |
12 | 13 | ||
13 | # CFLAGS are computed in Makefile and reference CCOPTS | 14 | # CFLAGS are computed in Makefile and reference CCOPTS |
14 | # | 15 | # |