Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 517393d903089f921915530ffa689a7a1d113420 / . / poky / meta / recipes-core / systemd / systemd / 0001-Adjust-for-musl-headers.patch
blob: 6496280ddada922417e804dbebcc35f64a268a9f [file] [log] [blame]
Andrew Geisslerd5838332022-05-27 11:33:10 -0500[diff] [blame]1From 9a1841402ce3ef21a10a7314a07a615f8196d406 Mon Sep 17 00:00:00 2001
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 21 Jan 2022 22:19:37 -0800
4Subject: [PATCH] Adjust for musl headers
5
6Upstream-Status: Inappropriate [musl specific]
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
Andrew Geisslerd5838332022-05-27 11:33:10 -0500[diff] [blame]9
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]10---
11 src/libsystemd-network/sd-dhcp6-client.c | 2 +-
12 src/network/netdev/bareudp.c | 2 +-
13 src/network/netdev/batadv.c | 2 +-
14 src/network/netdev/bond.c | 2 +-
15 src/network/netdev/bridge.c | 2 +-
16 src/network/netdev/dummy.c | 2 +-
17 src/network/netdev/geneve.c | 2 +-
18 src/network/netdev/ifb.c | 2 +-
19 src/network/netdev/ipoib.c | 2 +-
20 src/network/netdev/ipvlan.c | 2 +-
21 src/network/netdev/macsec.c | 2 +-
22 src/network/netdev/macvlan.c | 2 +-
23 src/network/netdev/netdev.c | 2 +-
24 src/network/netdev/netdevsim.c | 2 +-
25 src/network/netdev/nlmon.c | 2 +-
26 src/network/netdev/tunnel.c | 2 +-
27 src/network/netdev/vcan.c | 2 +-
28 src/network/netdev/veth.c | 2 +-
29 src/network/netdev/vlan.c | 2 +-
30 src/network/netdev/vrf.c | 2 +-
31 src/network/netdev/vxcan.c | 2 +-
32 src/network/netdev/vxlan.c | 2 +-
Andrew Geisslerd5838332022-05-27 11:33:10 -0500[diff] [blame]33 src/network/netdev/wireguard.c | 2 +-
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]34 src/network/netdev/xfrm.c | 2 +-
35 src/network/networkd-bridge-mdb.c | 4 ++--
36 src/network/networkd-dhcp-common.c | 3 ++-
37 src/network/networkd-dhcp-prefix-delegation.c | 4 ++--
38 src/network/networkd-dhcp-server.c | 2 +-
39 src/network/networkd-dhcp4.c | 2 +-
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]40 src/network/networkd-ipv6ll.c | 2 +-
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]41 src/network/networkd-link.c | 2 +-
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]42 src/network/networkd-ndisc.c | 2 +-
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]43 src/network/networkd-route.c | 8 ++++----
44 src/network/networkd-setlink.c | 2 +-
45 src/shared/linux/ethtool.h | 3 ++-
46 src/shared/netif-util.c | 2 +-
47 src/udev/udev-builtin-net_id.c | 2 +-
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]48 37 files changed, 44 insertions(+), 42 deletions(-)
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]49
50--- a/src/libsystemd-network/sd-dhcp6-client.c
51+++ b/src/libsystemd-network/sd-dhcp6-client.c
52@@ -5,7 +5,7 @@
53
54 #include <errno.h>
55 #include <sys/ioctl.h>
56-#include <linux/if_arp.h>
57+//#include <linux/if_arp.h>
58 #include <linux/if_infiniband.h>
59
60 #include "sd-dhcp6-client.h"
61--- a/src/network/netdev/bareudp.c
62+++ b/src/network/netdev/bareudp.c
63@@ -2,7 +2,7 @@
64 * Copyright © 2020 VMware, Inc. */
65
66 #include <netinet/in.h>
67-#include <linux/if_arp.h>
68+//#include <linux/if_arp.h>
69
70 #include "bareudp.h"
71 #include "netlink-util.h"
72--- a/src/network/netdev/batadv.c
73+++ b/src/network/netdev/batadv.c
74@@ -3,7 +3,7 @@
75 #include <inttypes.h>
76 #include <netinet/in.h>
77 #include <linux/genetlink.h>
78-#include <linux/if_arp.h>
79+//#include <linux/if_arp.h>
80
81 #include "batadv.h"
82 #include "fileio.h"
83--- a/src/network/netdev/bond.c
84+++ b/src/network/netdev/bond.c
85@@ -1,7 +1,7 @@
86 /* SPDX-License-Identifier: LGPL-2.1-or-later */
87
88 #include <netinet/in.h>
89-#include <linux/if_arp.h>
90+//#include <linux/if_arp.h>
91
92 #include "alloc-util.h"
93 #include "bond.h"
94--- a/src/network/netdev/bridge.c
95+++ b/src/network/netdev/bridge.c
96@@ -2,7 +2,7 @@
97
98 #include <net/if.h>
99 #include <netinet/in.h>
100-#include <linux/if_arp.h>
101+//#include <linux/if_arp.h>
102 #include <linux/if_bridge.h>
103
104 #include "bridge.h"
105--- a/src/network/netdev/dummy.c
106+++ b/src/network/netdev/dummy.c
107@@ -1,6 +1,6 @@
108 /* SPDX-License-Identifier: LGPL-2.1-or-later */
109
110-#include <linux/if_arp.h>
111+//#include <linux/if_arp.h>
112
113 #include "dummy.h"
114
115--- a/src/network/netdev/geneve.c
116+++ b/src/network/netdev/geneve.c
117@@ -2,7 +2,7 @@
118
119 #include <net/if.h>
120 #include <netinet/in.h>
121-#include <linux/if_arp.h>
122+//#include <linux/if_arp.h>
123
124 #include "alloc-util.h"
125 #include "conf-parser.h"
126--- a/src/network/netdev/ifb.c
127+++ b/src/network/netdev/ifb.c
128@@ -1,7 +1,7 @@
129 /* SPDX-License-Identifier: LGPL-2.1-or-later
130 * Copyright © 2019 VMware, Inc. */
131
132-#include <linux/if_arp.h>
133+//#include <linux/if_arp.h>
134
135 #include "ifb.h"
136
137--- a/src/network/netdev/ipoib.c
138+++ b/src/network/netdev/ipoib.c
139@@ -1,6 +1,6 @@
140 /* SPDX-License-Identifier: LGPL-2.1-or-later */
141
142-#include <linux/if_arp.h>
143+//#include <linux/if_arp.h>
144 #include <linux/if_link.h>
145
146 #include "ipoib.h"
147--- a/src/network/netdev/ipvlan.c
148+++ b/src/network/netdev/ipvlan.c
149@@ -2,7 +2,7 @@
150
151 #include <net/if.h>
152 #include <netinet/in.h>
153-#include <linux/if_arp.h>
154+//#include <linux/if_arp.h>
155
156 #include "conf-parser.h"
157 #include "ipvlan.h"
158--- a/src/network/netdev/macsec.c
159+++ b/src/network/netdev/macsec.c
160@@ -1,7 +1,7 @@
161 /* SPDX-License-Identifier: LGPL-2.1-or-later */
162
163 #include <netinet/in.h>
164-#include <linux/if_arp.h>
165+//#include <linux/if_arp.h>
166 #include <linux/if_ether.h>
167 #include <linux/if_macsec.h>
168 #include <linux/genetlink.h>
169--- a/src/network/netdev/macvlan.c
170+++ b/src/network/netdev/macvlan.c
171@@ -2,7 +2,7 @@
172
173 #include <net/if.h>
174 #include <netinet/in.h>
175-#include <linux/if_arp.h>
176+//#include <linux/if_arp.h>
177
178 #include "conf-parser.h"
179 #include "macvlan.h"
180--- a/src/network/netdev/netdev.c
181+++ b/src/network/netdev/netdev.c
182@@ -2,7 +2,7 @@
183
184 #include <net/if.h>
185 #include <netinet/in.h>
186-#include <linux/if_arp.h>
187+//#include <linux/if_arp.h>
188 #include <unistd.h>
189
190 #include "alloc-util.h"
191--- a/src/network/netdev/netdevsim.c
192+++ b/src/network/netdev/netdevsim.c
193@@ -1,6 +1,6 @@
194 /* SPDX-License-Identifier: LGPL-2.1-or-later */
195
196-#include <linux/if_arp.h>
197+//#include <linux/if_arp.h>
198
199 #include "netdevsim.h"
200
201--- a/src/network/netdev/nlmon.c
202+++ b/src/network/netdev/nlmon.c
203@@ -1,6 +1,6 @@
204 /* SPDX-License-Identifier: LGPL-2.1-or-later */
205
206-#include <linux/if_arp.h>
207+//#include <linux/if_arp.h>
208
209 #include "nlmon.h"
210
211--- a/src/network/netdev/tunnel.c
212+++ b/src/network/netdev/tunnel.c
213@@ -2,7 +2,7 @@
214
215 #include <netinet/in.h>
216 #include <linux/fou.h>
217-#include <linux/if_arp.h>
218+//#include <linux/if_arp.h>
219 #include <linux/if_tunnel.h>
220 #include <linux/ip.h>
221 #include <linux/ip6_tunnel.h>
222--- a/src/network/netdev/vcan.c
223+++ b/src/network/netdev/vcan.c
224@@ -1,6 +1,6 @@
225 /* SPDX-License-Identifier: LGPL-2.1-or-later */
226
227-#include <linux/if_arp.h>
228+//#include <linux/if_arp.h>
229
230 #include "vcan.h"
231
232--- a/src/network/netdev/veth.c
233+++ b/src/network/netdev/veth.c
234@@ -3,7 +3,7 @@
235 #include <errno.h>
236 #include <net/if.h>
237 #include <netinet/in.h>
238-#include <linux/if_arp.h>
239+//#include <linux/if_arp.h>
240 #include <linux/veth.h>
241
242 #include "netlink-util.h"
243--- a/src/network/netdev/vlan.c
244+++ b/src/network/netdev/vlan.c
245@@ -2,7 +2,7 @@
246
247 #include <errno.h>
248 #include <net/if.h>
249-#include <linux/if_arp.h>
250+//#include <linux/if_arp.h>
251 #include <linux/if_vlan.h>
252
253 #include "parse-util.h"
254--- a/src/network/netdev/vrf.c
255+++ b/src/network/netdev/vrf.c
256@@ -2,7 +2,7 @@
257
258 #include <net/if.h>
259 #include <netinet/in.h>
260-#include <linux/if_arp.h>
261+//#include <linux/if_arp.h>
262
263 #include "vrf.h"
264
265--- a/src/network/netdev/vxcan.c
266+++ b/src/network/netdev/vxcan.c
267@@ -1,7 +1,7 @@
268 /* SPDX-License-Identifier: LGPL-2.1-or-later */
269
270 #include <linux/can/vxcan.h>
271-#include <linux/if_arp.h>
272+//#include <linux/if_arp.h>
273
274 #include "vxcan.h"
275
276--- a/src/network/netdev/vxlan.c
277+++ b/src/network/netdev/vxlan.c
278@@ -2,7 +2,7 @@
279
280 #include <net/if.h>
281 #include <netinet/in.h>
282-#include <linux/if_arp.h>
283+//#include <linux/if_arp.h>
284
285 #include "conf-parser.h"
286 #include "alloc-util.h"
Andrew Geisslerd5838332022-05-27 11:33:10 -0500[diff] [blame]287--- a/src/network/netdev/wireguard.c
288+++ b/src/network/netdev/wireguard.c
289@@ -6,7 +6,7 @@
290 #include <sys/ioctl.h>
291 #include <net/if.h>
292 #include <netinet/in.h>
293-#include <linux/if_arp.h>
294+//#include <linux/if_arp.h>
295 #include <linux/ipv6_route.h>
296
297 #include "sd-resolve.h"
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]298--- a/src/network/netdev/xfrm.c
299+++ b/src/network/netdev/xfrm.c
300@@ -1,6 +1,6 @@
301 /* SPDX-License-Identifier: LGPL-2.1-or-later */
302
303-#include <linux/if_arp.h>
304+//#include <linux/if_arp.h>
305
306 #include "missing_network.h"
307 #include "xfrm.h"
308--- a/src/network/networkd-bridge-mdb.c
309+++ b/src/network/networkd-bridge-mdb.c
310@@ -1,7 +1,5 @@
311 /* SPDX-License-Identifier: LGPL-2.1-or-later */
312
313-#include <net/if.h>
314-#include <linux/if_bridge.h>
315
316 #include "netlink-util.h"
317 #include "networkd-bridge-mdb.h"
318@@ -11,6 +9,8 @@
319 #include "networkd-queue.h"
320 #include "string-util.h"
321 #include "vlan-util.h"
322+#include <net/if.h>
323+#include <linux/if_bridge.h>
324
325 #define STATIC_BRIDGE_MDB_ENTRIES_PER_NETWORK_MAX 1024U
326
327--- a/src/network/networkd-dhcp-common.c
328+++ b/src/network/networkd-dhcp-common.c
329@@ -1,7 +1,8 @@
330 /* SPDX-License-Identifier: LGPL-2.1-or-later */
331
332 #include <netinet/in.h>
333-#include <linux/if_arp.h>
334+//#include <linux/if_arp.h>
335+#include <net/if.h>
336
337 #include "bus-error.h"
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]338 #include "bus-locator.h"
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]339--- a/src/network/networkd-dhcp-prefix-delegation.c
340+++ b/src/network/networkd-dhcp-prefix-delegation.c
341@@ -1,7 +1,5 @@
342 /* SPDX-License-Identifier: LGPL-2.1-or-later */
343
344-#include <linux/ipv6_route.h>
345-
346 #include "sd-dhcp6-client.h"
347
348 #include "hashmap.h"
349@@ -21,6 +19,8 @@
350 #include "strv.h"
351 #include "tunnel.h"
352
353+#include <linux/ipv6_route.h>
354+
355 bool link_dhcp_pd_is_enabled(Link *link) {
356 assert(link);
357
358--- a/src/network/networkd-dhcp-server.c
359+++ b/src/network/networkd-dhcp-server.c
360@@ -1,7 +1,7 @@
361 /* SPDX-License-Identifier: LGPL-2.1-or-later */
362
363 #include <netinet/in.h>
364-#include <linux/if_arp.h>
365+//#include <linux/if_arp.h>
366 #include <linux/if.h>
367
368 #include "sd-dhcp-server.h"
369--- a/src/network/networkd-dhcp4.c
370+++ b/src/network/networkd-dhcp4.c
371@@ -3,7 +3,7 @@
372 #include <netinet/in.h>
373 #include <netinet/ip.h>
374 #include <linux/if.h>
375-#include <linux/if_arp.h>
376+//#include <linux/if_arp.h>
377
378 #include "alloc-util.h"
379 #include "dhcp-client-internal.h"
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]380--- a/src/network/networkd-ipv6ll.c
381+++ b/src/network/networkd-ipv6ll.c
382@@ -1,7 +1,7 @@
383 /* SPDX-License-Identifier: LGPL-2.1-or-later */
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]384
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]385 #include <linux/if.h>
386-#include <linux/if_arp.h>
387+//#include <linux/if_arp.h>
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]388
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]389 #include "in-addr-util.h"
390 #include "networkd-address.h"
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]391--- a/src/network/networkd-link.c
392+++ b/src/network/networkd-link.c
393@@ -3,7 +3,7 @@
394 #include <net/if.h>
395 #include <netinet/in.h>
396 #include <linux/if.h>
397-#include <linux/if_arp.h>
398+//#include <linux/if_arp.h>
399 #include <linux/if_link.h>
400 #include <linux/netdevice.h>
401 #include <sys/socket.h>
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]402--- a/src/network/networkd-ndisc.c
403+++ b/src/network/networkd-ndisc.c
404@@ -6,7 +6,7 @@
405 #include <arpa/inet.h>
406 #include <netinet/icmp6.h>
407 #include <linux/if.h>
408-#include <linux/if_arp.h>
409+//#include <linux/if_arp.h>
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]410
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]411 #include "sd-ndisc.h"
Andrew Geissler517393d2023-01-13 08:55:19 -0600[diff] [blame^]412
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]413--- a/src/network/networkd-route.c
414+++ b/src/network/networkd-route.c
415@@ -1,9 +1,5 @@
416 /* SPDX-License-Identifier: LGPL-2.1-or-later */
417
418-#include <linux/icmpv6.h>
419-#include <linux/ipv6_route.h>
420-#include <linux/nexthop.h>
421-
422 #include "alloc-util.h"
423 #include "event-util.h"
424 #include "netlink-util.h"
425@@ -21,6 +17,10 @@
426 #include "vrf.h"
427 #include "wireguard.h"
428
429+#include <linux/icmpv6.h>
430+#include <linux/ipv6_route.h>
431+#include <linux/nexthop.h>
432+
433 int route_new(Route **ret) {
434 _cleanup_(route_freep) Route *route = NULL;
435
436--- a/src/network/networkd-setlink.c
437+++ b/src/network/networkd-setlink.c
438@@ -2,7 +2,7 @@
439
440 #include <netinet/in.h>
441 #include <linux/if.h>
442-#include <linux/if_arp.h>
443+//#include <linux/if_arp.h>
444 #include <linux/if_bridge.h>
445
446 #include "missing_network.h"
447--- a/src/shared/linux/ethtool.h
448+++ b/src/shared/linux/ethtool.h
449@@ -16,7 +16,8 @@
450
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]451 #include <linux/const.h>
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]452 #include <linux/types.h>
453-#include <linux/if_ether.h>
454+#include <netinet/if_ether.h>
455+//#include <linux/if_ether.h>
456
457 #ifndef __KERNEL__
458 #include <limits.h> /* for INT_MAX */
459--- a/src/shared/netif-util.c
460+++ b/src/shared/netif-util.c
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]461@@ -1,7 +1,7 @@
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]462 /* SPDX-License-Identifier: LGPL-2.1-or-later */
463
Andrew Geissler615f2f12022-07-15 14:00:58 -0500[diff] [blame]464 #include <linux/if.h>
Andrew Geissler7e0e3c02022-02-25 20:34:39 +0000[diff] [blame]465-#include <linux/if_arp.h>
466+//#include <linux/if_arp.h>
467
468 #include "arphrd-util.h"
469 #include "device-util.h"
470--- a/src/udev/udev-builtin-net_id.c
471+++ b/src/udev/udev-builtin-net_id.c
472@@ -18,7 +18,7 @@
473 #include <stdarg.h>
474 #include <unistd.h>
475 #include <linux/if.h>
476-#include <linux/if_arp.h>
477+//#include <linux/if_arp.h>
478 #include <linux/netdevice.h>
479 #include <linux/pci_regs.h>
480