diff options
| author |   Adrian Bunk <bunk@stusta.de> | 2019-05-11 22:07:25 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-22 07:41:17 +0100 |
| commit | 335f891c5517cbe16e9e15e40882301442b772a2 (patch) | |
| tree | 09b425dcc321316c969b66cfd22b80dcd64224a2 /meta | |
| parent | 9961e8145ad12af0737dd04ee8b86647f7033b3b (diff) | |
| download | openembedded-core-335f891c5517cbe16e9e15e40882301442b772a2.tar.gz | |
iproute2: Remove bogus workaround patch for musl
This patch worked around a problem in musl but caused
the following:
iplink_bridge.c: In function 'br_dump_bridge_id':
iplink_bridge.c:77:2: warning: implicit declaration of function 'ether_ntoa_r'; did you mean 'inet_ntoa'? [-Wimplicit-function-declaration]
ether_ntoa_r((const struct ether_addr *)id->addr, eaddr);
^~~~~~~~~~~~
In the meantime upstream has already implemented a different
workaround for musl, so this patch can just be dropped.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb | 1 |
2 files changed, 0 insertions, 31 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 deleted file mode 100644 index a9027c5b58..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001 -From: Changhyeok Bae <changhyeok.bae@gmail.com> -Date: Mon, 13 Nov 2017 15:59:35 +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: Pending [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 cccdec1..f065b22 100644 ---- a/ip/iplink_bridge.c -+++ b/ip/iplink_bridge.c -@@ -13,7 +13,6 @@ - #include <stdlib.h> - #include <string.h> - #include <netinet/in.h> --#include <netinet/ether.h> - #include <linux/if_link.h> - #include <linux/if_bridge.h> - #include <net/if.h> --- -2.7.4 - diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb index c5ac987b6f..8f33c7fe19 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb @@ -3,7 +3,6 @@ require iproute2.inc SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ file://configure-cross.patch \ file://0001-libc-compat.h-add-musl-workaround.patch \ - file://0001-ip-Remove-unneed-header.patch \ " SRC_URI[md5sum] = "d22107b4d7cfb999eeb8ad8a0aec1124" |