diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-19 08:41:32 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-09-13 18:19:02 -0700 |
commit | ad50bde57469a8febaed9fd6f5b983c88ccf0e1f (patch) | |
tree | 27e4bd77e807b504b245bfa8cd7a07af883a1884 | |
parent | 18ddc5ce6314334bbd25e42b80de43d7e364bf40 (diff) | |
download | meta-openembedded-ad50bde57469a8febaed9fd6f5b983c88ccf0e1f.tar.gz |
zeroconf: Fix build with musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
(cherry picked from commit 48bce13c9b47ddd149f690b81606248dc6c47fc4)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch | 69 | ||||
-rw-r--r-- | meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb | 4 |
2 files changed, 72 insertions, 1 deletions
diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch b/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch new file mode 100644 index 000000000..b4d6d94b0 --- /dev/null +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf/0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch | |||
@@ -0,0 +1,69 @@ | |||
1 | From 549773fdaf1fb003b84f25df386a07d299cdeb3e Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 18 Jul 2017 21:25:33 -0700 | ||
4 | Subject: [PATCH] zeroconf: Rename arp_op to avoid namespace conflicts with C | ||
5 | library | ||
6 | |||
7 | on musl e.g. we get | ||
8 | In file included from /mnt/a/oe/build/tmp/work/corei7-64-bec-linux-musl/zeroconf/0.9-r1/recipe-sysroot/usr/include/net/ethernet.h:10:0, | ||
9 | |||
10 | This is because in musl arp_op is a define which is included | ||
11 | and causes the conflict | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | zeroconf.c | 10 +++++----- | ||
16 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
17 | |||
18 | diff --git a/zeroconf.c b/zeroconf.c | ||
19 | index 812d34b..f27e907 100644 | ||
20 | --- a/zeroconf.c | ||
21 | +++ b/zeroconf.c | ||
22 | @@ -14,8 +14,6 @@ | ||
23 | |||
24 | #include <sys/types.h> | ||
25 | #include <sys/socket.h> | ||
26 | -#include <linux/rtnetlink.h> | ||
27 | -#include <linux/if.h> | ||
28 | #include <stdio.h> | ||
29 | #include <stdlib.h> | ||
30 | #include <string.h> | ||
31 | @@ -34,6 +32,8 @@ | ||
32 | #include <sys/time.h> | ||
33 | #include <signal.h> | ||
34 | #include <limits.h> | ||
35 | +#include <linux/rtnetlink.h> | ||
36 | +#include <linux/if.h> | ||
37 | |||
38 | #include "delay.h" | ||
39 | |||
40 | @@ -108,7 +108,7 @@ int arp_conflict(struct intf *intf, struct arp_packet *pkt); | ||
41 | void arp_packet_dump(struct arp_packet *pkt); | ||
42 | void arp_packet_send(int as, | ||
43 | struct intf *intf, | ||
44 | - short int arp_op, | ||
45 | + short int arpop, | ||
46 | int null_sender); | ||
47 | void arp_probe(int as, struct intf *intf); | ||
48 | void arp_claim(int as, struct intf *intf); | ||
49 | @@ -1591,7 +1591,7 @@ int arp_conflict(struct intf *intf, struct arp_packet *pkt) | ||
50 | |||
51 | void arp_packet_send(int as, | ||
52 | struct intf *intf, | ||
53 | - short int arp_op, | ||
54 | + short int arpop, | ||
55 | int null_sender) | ||
56 | { | ||
57 | |||
58 | @@ -1605,7 +1605,7 @@ void arp_packet_send(int as, | ||
59 | ap.arp.ar_pro = htons(ARP_IP_PROTO); | ||
60 | ap.arp.ar_hln = ETH_ALEN; | ||
61 | ap.arp.ar_pln = 4; /* octets in IPv4 address */ | ||
62 | - ap.arp.ar_op = htons(arp_op); | ||
63 | + ap.arp.ar_op = htons(arpop); | ||
64 | |||
65 | /* filling with 0xff sets the destination to | ||
66 | * the broadcast link-layer address for free | ||
67 | -- | ||
68 | 2.13.3 | ||
69 | |||
diff --git a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb index 13f9b9b9a..753d83298 100644 --- a/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb +++ b/meta-networking/recipes-protocols/zeroconf/zeroconf_0.9.bb | |||
@@ -20,7 +20,9 @@ SRC_URI = "http://www.progsoc.org/~wildfire/zeroconf/download/${BPN}-${PV}.tar.g | |||
20 | file://compilefix.patch \ | 20 | file://compilefix.patch \ |
21 | file://makefile-add-ldflags.patch \ | 21 | file://makefile-add-ldflags.patch \ |
22 | file://zeroconf-default \ | 22 | file://zeroconf-default \ |
23 | file://debian-zeroconf" | 23 | file://debian-zeroconf \ |
24 | file://0001-zeroconf-Rename-arp_op-to-avoid-namespace-conflicts-.patch \ | ||
25 | " | ||
24 | 26 | ||
25 | SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2" | 27 | SRC_URI[md5sum] = "bdafb16b008ebb5633e4e581f77821d2" |
26 | SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b" | 28 | SRC_URI[sha256sum] = "a8c74df127753e2310fa1e072f3c9ca44a404bb0bbce9cfec7a84c6dff8bec7b" |