iproute2: Remove bogus workaround patch for musl
PATCH 1/1 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 <[email protected]>
--- .../0001-ip-Remove-unneed-header.patch | 30 ------------------- .../iproute2/iproute2_5.0.0.bb | 1 - 2 files changed, 31 deletions(-) delete mode 100644 meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch
meta/recipes-connectivity/iproute2/iproute2/0001-ip-Remove-unneed-header.patch deleted +0 -30
@@ -1,30 +0,0 @@ -From 02ed10fc5215c4a32e6740b0a0c2439659be6801 Mon Sep 17 00:00:00 2001 -From: Changhyeok Bae <[email protected]> -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 <[email protected]> - -Upstream-Status: Pending [[email protected]] ---- - 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 -
meta/recipes-connectivity/iproute2/iproute2_5.0.0.bb +0 -1
@@ -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"
Signature · 1 line
2.17.1