diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:48 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:48 +0300 |
commit | 9600a7403ba2848c8751280077503a3e0f2f3481 (patch) | |
tree | 996726918f255cc9686dec34628fab410ac8f550 /meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch | |
parent | b11bad1ba28f79c08266efb9cc265d89103e5939 (diff) | |
parent | 5ec7af7413906b500cce396255bde69c9770f6d8 (diff) | |
download | openbmc-9600a7403ba2848c8751280077503a3e0f2f3481.tar.xz |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch')
-rw-r--r-- | meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch b/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch deleted file mode 100644 index b48b467b8..000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/dhcpcd/files/0001-dhcpcd-Fix-build-error-with-musl.patch +++ /dev/null @@ -1,34 +0,0 @@ -Subject: [PATCH] dhcpcd: Fix build error with musl. - -Re-organize the header includes in if-linux.c to fix error as follows: -In file included from if-linux.c:49: -path/usr/include/netinet/if_ether.h:112:8: error: redefinition of 'struct ethhdr' - -Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> ---- - src/if-linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/if-linux.c b/src/if-linux.c -index fd47278..bfa878b 100644 ---- a/src/if-linux.c -+++ b/src/if-linux.c -@@ -37,6 +37,7 @@ - #include <linux/if_addr.h> - #include <linux/if_link.h> - #include <linux/if_packet.h> -+#include <netinet/if_ether.h> - #include <linux/if_tun.h> - #include <linux/if_vlan.h> - #include <linux/filter.h> -@@ -46,7 +47,6 @@ - - #include <arpa/inet.h> - #include <net/if.h> --#include <netinet/if_ether.h> - #include <netinet/in_systm.h> - #include <netinet/in.h> - #include <net/route.h> --- -2.7.4 - |