diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch | 195 |
1 files changed, 163 insertions, 32 deletions
diff --git a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch index b41f6c7bee..6d73d715ce 100644 --- a/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch +++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch | |||
@@ -1,28 +1,63 @@ | |||
1 | From 67a988ae82c776d11be76de7180d50ea027ac442 Mon Sep 17 00:00:00 2001 | 1 | Include netinet/if_ether.h |
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 25 Feb 2019 14:24:20 +0800 | ||
4 | Subject: [PATCH 06/24] Include netinet/if_ether.h | ||
5 | 2 | ||
6 | Fixes | 3 | Fixes |
7 | /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' | 4 | /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' |
8 | struct ethhdr { | 5 | struct ethhdr { |
9 | ^~~~~~ | 6 | ^~~~~~ |
10 | 7 | ||
8 | and related arphdr, arpreq, and arpreq_old errors | ||
9 | /path/to/systemd/recipe-sysroot/usr/include/net/if_arp.h:22:8: error: redefinition of 'struct arphdr' | ||
10 | struct arphdr { | ||
11 | ^~~~~~ | ||
12 | |||
13 | The latter requires removing some includes of net/if_arp.h to avoid | ||
14 | conflicting with netinet/if_ether.h. | ||
15 | |||
16 | Upstream-Status: Inappropriate [musl specific] | ||
17 | |||
18 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
19 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
20 | [rebased for systemd 243] | ||
21 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
22 | |||
11 | Upstream-Status: Inappropriate [musl specific] | 23 | Upstream-Status: Inappropriate [musl specific] |
12 | 24 | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 25 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 26 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
27 | [rebased for systemd 243] | ||
28 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
15 | --- | 29 | --- |
30 | src/libsystemd-network/sd-dhcp6-client.c | 1 - | ||
16 | src/libsystemd/sd-netlink/netlink-types.c | 1 + | 31 | src/libsystemd/sd-netlink/netlink-types.c | 1 + |
17 | src/network/netdev/tuntap.c | 1 + | 32 | src/machine/machine-dbus.c | 1 + |
33 | src/network/netdev/macsec.c | 1 + | ||
34 | src/network/netdev/netdev.c | 1 + | ||
18 | src/network/networkd-brvlan.c | 1 + | 35 | src/network/networkd-brvlan.c | 1 + |
19 | src/udev/net/ethtool-util.c | 1 + | 36 | src/network/networkd-dhcp-common.c | 1 + |
20 | src/udev/net/ethtool-util.h | 1 + | 37 | src/network/networkd-dhcp4.c | 2 +- |
38 | src/network/networkd-dhcp6.c | 2 +- | ||
39 | src/network/networkd-link.c | 2 +- | ||
40 | src/network/networkd-network.c | 1 + | ||
41 | src/shared/ethtool-util.c | 1 + | ||
42 | src/shared/ethtool-util.h | 1 + | ||
43 | src/udev/net/link-config.c | 1 + | ||
21 | src/udev/udev-builtin-net_setup_link.c | 1 + | 44 | src/udev/udev-builtin-net_setup_link.c | 1 + |
22 | 6 files changed, 6 insertions(+) | 45 | 15 files changed, 14 insertions(+), 4 deletions(-) |
23 | 46 | ||
47 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c | ||
48 | index d7a5349c70..68b41dfb6c 100644 | ||
49 | --- a/src/libsystemd-network/sd-dhcp6-client.c | ||
50 | +++ b/src/libsystemd-network/sd-dhcp6-client.c | ||
51 | @@ -6,7 +6,6 @@ | ||
52 | #include <errno.h> | ||
53 | #include <string.h> | ||
54 | #include <sys/ioctl.h> | ||
55 | -#include <linux/if_arp.h> | ||
56 | #include <linux/if_infiniband.h> | ||
57 | |||
58 | #include "sd-dhcp6-client.h" | ||
24 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c | 59 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c |
25 | index 9dcd3f2..e23ff4c 100644 | 60 | index de9b8b21ab..f64f6500f7 100644 |
26 | --- a/src/libsystemd/sd-netlink/netlink-types.c | 61 | --- a/src/libsystemd/sd-netlink/netlink-types.c |
27 | +++ b/src/libsystemd/sd-netlink/netlink-types.c | 62 | +++ b/src/libsystemd/sd-netlink/netlink-types.c |
28 | @@ -3,6 +3,7 @@ | 63 | @@ -3,6 +3,7 @@ |
@@ -30,23 +65,45 @@ index 9dcd3f2..e23ff4c 100644 | |||
30 | #include <stdint.h> | 65 | #include <stdint.h> |
31 | #include <sys/socket.h> | 66 | #include <sys/socket.h> |
32 | +#include <netinet/if_ether.h> | 67 | +#include <netinet/if_ether.h> |
68 | #include <linux/can/vxcan.h> | ||
33 | #include <linux/netlink.h> | 69 | #include <linux/netlink.h> |
34 | #include <linux/rtnetlink.h> | 70 | #include <linux/rtnetlink.h> |
35 | #include <linux/genetlink.h> | 71 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c |
36 | diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c | 72 | index 0d58b5eb8b..01093c1f62 100644 |
37 | index 951138d..1ad499d 100644 | 73 | --- a/src/machine/machine-dbus.c |
38 | --- a/src/network/netdev/tuntap.c | 74 | +++ b/src/machine/machine-dbus.c |
39 | +++ b/src/network/netdev/tuntap.c | 75 | @@ -4,6 +4,7 @@ |
40 | @@ -2,6 +2,7 @@ | 76 | #include <string.h> |
77 | #include <sys/mount.h> | ||
78 | #include <sys/wait.h> | ||
79 | +#include <netinet/if_ether.h> | ||
80 | |||
81 | /* When we include libgen.h because we need dirname() we immediately | ||
82 | * undefine basename() since libgen.h defines it as a macro to the POSIX | ||
83 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c | ||
84 | index cf281e75a6..269dc618ff 100644 | ||
85 | --- a/src/network/netdev/macsec.c | ||
86 | +++ b/src/network/netdev/macsec.c | ||
87 | @@ -1,5 +1,6 @@ | ||
88 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
89 | |||
90 | +#include <netinet/if_ether.h> | ||
91 | #include <netinet/in.h> | ||
92 | #include <linux/if_ether.h> | ||
93 | #include <linux/if_macsec.h> | ||
94 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c | ||
95 | index 7735b455b7..ed4eda4a44 100644 | ||
96 | --- a/src/network/netdev/netdev.c | ||
97 | +++ b/src/network/netdev/netdev.c | ||
98 | @@ -1,5 +1,6 @@ | ||
99 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
41 | 100 | ||
42 | #include <errno.h> | ||
43 | #include <fcntl.h> | ||
44 | +#include <netinet/if_ether.h> | 101 | +#include <netinet/if_ether.h> |
45 | #include <linux/if_tun.h> | ||
46 | #include <net/if.h> | 102 | #include <net/if.h> |
47 | #include <netinet/if_ether.h> | 103 | #include <netinet/in.h> |
104 | |||
48 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c | 105 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c |
49 | index 8377623..132af60 100644 | 106 | index c3c5d535ac..ebea408c89 100644 |
50 | --- a/src/network/networkd-brvlan.c | 107 | --- a/src/network/networkd-brvlan.c |
51 | +++ b/src/network/networkd-brvlan.c | 108 | +++ b/src/network/networkd-brvlan.c |
52 | @@ -4,6 +4,7 @@ | 109 | @@ -4,6 +4,7 @@ |
@@ -57,10 +114,76 @@ index 8377623..132af60 100644 | |||
57 | #include <linux/if_bridge.h> | 114 | #include <linux/if_bridge.h> |
58 | #include <stdbool.h> | 115 | #include <stdbool.h> |
59 | 116 | ||
60 | diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c | 117 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c |
61 | index 0dcec03..3695b10 100644 | 118 | index 626b975839..42fe92f320 100644 |
62 | --- a/src/udev/net/ethtool-util.c | 119 | --- a/src/network/networkd-dhcp-common.c |
63 | +++ b/src/udev/net/ethtool-util.c | 120 | +++ b/src/network/networkd-dhcp-common.c |
121 | @@ -1,6 +1,7 @@ | ||
122 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
123 | |||
124 | #include "networkd-dhcp-common.h" | ||
125 | +#include <netinet/if_ether.h> | ||
126 | #include "networkd-network.h" | ||
127 | #include "parse-util.h" | ||
128 | #include "string-table.h" | ||
129 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c | ||
130 | index 662770b50e..c6ab62a94d 100644 | ||
131 | --- a/src/network/networkd-dhcp4.c | ||
132 | +++ b/src/network/networkd-dhcp4.c | ||
133 | @@ -1,8 +1,8 @@ | ||
134 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
135 | |||
136 | +#include <netinet/if_ether.h> | ||
137 | #include <netinet/in.h> | ||
138 | #include <linux/if.h> | ||
139 | -#include <linux/if_arp.h> | ||
140 | |||
141 | #include "alloc-util.h" | ||
142 | #include "hostname-util.h" | ||
143 | diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c | ||
144 | index 8ad736a82b..f41b4d834e 100644 | ||
145 | --- a/src/network/networkd-dhcp6.c | ||
146 | +++ b/src/network/networkd-dhcp6.c | ||
147 | @@ -3,9 +3,9 @@ | ||
148 | Copyright © 2014 Intel Corporation. All rights reserved. | ||
149 | ***/ | ||
150 | |||
151 | +#include <netinet/if_ether.h> | ||
152 | #include <netinet/in.h> | ||
153 | #include <linux/if.h> | ||
154 | -#include <linux/if_arp.h> | ||
155 | #include "sd-radv.h" | ||
156 | |||
157 | #include "sd-dhcp6-client.h" | ||
158 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c | ||
159 | index f5bb78890a..f13a36b791 100644 | ||
160 | --- a/src/network/networkd-link.c | ||
161 | +++ b/src/network/networkd-link.c | ||
162 | @@ -1,8 +1,8 @@ | ||
163 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
164 | |||
165 | +#include <netinet/if_ether.h> | ||
166 | #include <netinet/in.h> | ||
167 | #include <linux/if.h> | ||
168 | -#include <linux/if_arp.h> | ||
169 | #include <unistd.h> | ||
170 | |||
171 | #include "alloc-util.h" | ||
172 | diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c | ||
173 | index 2b8d0eb2fb..2f79ef25cd 100644 | ||
174 | --- a/src/network/networkd-network.c | ||
175 | +++ b/src/network/networkd-network.c | ||
176 | @@ -1,5 +1,6 @@ | ||
177 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
178 | |||
179 | +#include <netinet/if_ether.h> | ||
180 | #include <net/if.h> | ||
181 | #include <netinet/in.h> | ||
182 | #include <linux/netdevice.h> | ||
183 | diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c | ||
184 | index b0961df72e..53fcbbd84b 100644 | ||
185 | --- a/src/shared/ethtool-util.c | ||
186 | +++ b/src/shared/ethtool-util.c | ||
64 | @@ -1,5 +1,6 @@ | 187 | @@ -1,5 +1,6 @@ |
65 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 188 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
66 | 189 | ||
@@ -68,10 +191,10 @@ index 0dcec03..3695b10 100644 | |||
68 | #include <net/if.h> | 191 | #include <net/if.h> |
69 | #include <sys/ioctl.h> | 192 | #include <sys/ioctl.h> |
70 | #include <linux/ethtool.h> | 193 | #include <linux/ethtool.h> |
71 | diff --git a/src/udev/net/ethtool-util.h b/src/udev/net/ethtool-util.h | 194 | diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h |
72 | index 618b26b..ebfe82a 100644 | 195 | index 8b32b243f3..262b819976 100644 |
73 | --- a/src/udev/net/ethtool-util.h | 196 | --- a/src/shared/ethtool-util.h |
74 | +++ b/src/udev/net/ethtool-util.h | 197 | +++ b/src/shared/ethtool-util.h |
75 | @@ -2,6 +2,7 @@ | 198 | @@ -2,6 +2,7 @@ |
76 | #pragma once | 199 | #pragma once |
77 | 200 | ||
@@ -80,8 +203,19 @@ index 618b26b..ebfe82a 100644 | |||
80 | #include <linux/ethtool.h> | 203 | #include <linux/ethtool.h> |
81 | 204 | ||
82 | #include "conf-parser.h" | 205 | #include "conf-parser.h" |
206 | diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c | ||
207 | index d44af64d5e..fd052f1591 100644 | ||
208 | --- a/src/udev/net/link-config.c | ||
209 | +++ b/src/udev/net/link-config.c | ||
210 | @@ -1,5 +1,6 @@ | ||
211 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
212 | |||
213 | +#include <netinet/if_ether.h> | ||
214 | #include <linux/netdevice.h> | ||
215 | #include <netinet/ether.h> | ||
216 | |||
83 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c | 217 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c |
84 | index a845dfa..177289a 100644 | 218 | index ee3ca9fa38..9aa4e82874 100644 |
85 | --- a/src/udev/udev-builtin-net_setup_link.c | 219 | --- a/src/udev/udev-builtin-net_setup_link.c |
86 | +++ b/src/udev/udev-builtin-net_setup_link.c | 220 | +++ b/src/udev/udev-builtin-net_setup_link.c |
87 | @@ -1,5 +1,6 @@ | 221 | @@ -1,5 +1,6 @@ |
@@ -91,6 +225,3 @@ index a845dfa..177289a 100644 | |||
91 | #include "device-util.h" | 225 | #include "device-util.h" |
92 | #include "alloc-util.h" | 226 | #include "alloc-util.h" |
93 | #include "link-config.h" | 227 | #include "link-config.h" |
94 | -- | ||
95 | 2.7.4 | ||
96 | |||