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:30 +0100 |
| commit | 2a6fe7c6c1e113d930ddc8e06717747a779b46f1 (patch) | |
| tree | 9bad1f23f162d05703dfdda0418a4ebd706e929f | |
| parent | 61ecda8f7977ee2d30f31d2f384f65f933971568 (diff) | |
| download | openembedded-core-2a6fe7c6c1e113d930ddc8e06717747a779b46f1.tar.gz openembedded-core-2a6fe7c6c1e113d930ddc8e06717747a779b46f1.tar.bz2 openembedded-core-2a6fe7c6c1e113d930ddc8e06717747a779b46f1.zip | |
iproute2: Upgrade 4.10.0 -> 4.11.0
0001-ip-Remove-unneed-header.patch is to fix build error
built with musl.
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 @@ +From f58fc99c88a54135e55a6e0956ce8ae71078d1cc Mon Sep 17 00:00:00 2001 +From: Changhyeok Bae <changhyeok.bae@gmail.com> +Date: Mon, 12 Jun 2017 04:29:07 +0000 +Subject: [PATCH] ip: Remove unneed header + +Fix redefinition of struct ethhdr with a suitably patched musl libc +that suppresses the kernel if_ether.h. + +Signed-off-by: Changhyeok Bae <changhyeok.bae@gmail.com> + +Upstream-Status: Submitted [netdev@vger.kernel.org] +--- + ip/iplink_bridge.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/ip/iplink_bridge.c b/ip/iplink_bridge.c +index 818b43c..f065b22 100644 +--- a/ip/iplink_bridge.c ++++ b/ip/iplink_bridge.c +@@ -15,7 +15,6 @@ + #include <netinet/in.h> + #include <linux/if_link.h> + #include <linux/if_bridge.h> +-#include <netinet/ether.h> + #include <net/if.h> + + #include "rt_names.h" +-- +2.7.4 + 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 \ file://0001-iproute2-de-bash-scripts.patch \ file://0001-libc-compat.h-add-musl-workaround.patch \ file://0001-include-stdint.h-explicitly-for-UINT16_MAX.patch \ + file://0001-ip-Remove-unneed-header.patch \ " -SRC_URI[md5sum] = "b94a2b0edefaeac124dc8f5d006931b9" -SRC_URI[sha256sum] = "22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8" +SRC_URI[md5sum] = "7a9498de88bcca95c305df6108ae197e" +SRC_URI[sha256sum] = "72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026" # CFLAGS are computed in Makefile and reference CCOPTS # |