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 | 166 |
1 files changed, 83 insertions, 83 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 9142d7b45c..abc438e4ba 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 | |||
@@ -52,10 +52,10 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com> | |||
52 | src/udev/udev-builtin-net_setup_link.c | 1 + | 52 | src/udev/udev-builtin-net_setup_link.c | 1 + |
53 | 19 files changed, 18 insertions(+), 4 deletions(-) | 53 | 19 files changed, 18 insertions(+), 4 deletions(-) |
54 | 54 | ||
55 | diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c | 55 | Index: systemd-stable/src/libsystemd-network/sd-dhcp6-client.c |
56 | index eac2e725cce7..1beae7ba91cc 100644 | 56 | =================================================================== |
57 | --- a/src/libsystemd-network/sd-dhcp6-client.c | 57 | --- systemd-stable.orig/src/libsystemd-network/sd-dhcp6-client.c |
58 | +++ b/src/libsystemd-network/sd-dhcp6-client.c | 58 | +++ systemd-stable/src/libsystemd-network/sd-dhcp6-client.c |
59 | @@ -5,7 +5,6 @@ | 59 | @@ -5,7 +5,6 @@ |
60 | 60 | ||
61 | #include <errno.h> | 61 | #include <errno.h> |
@@ -64,10 +64,10 @@ index eac2e725cce7..1beae7ba91cc 100644 | |||
64 | #include <linux/if_infiniband.h> | 64 | #include <linux/if_infiniband.h> |
65 | 65 | ||
66 | #include "sd-dhcp6-client.h" | 66 | #include "sd-dhcp6-client.h" |
67 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c | 67 | Index: systemd-stable/src/libsystemd/sd-netlink/netlink-types.c |
68 | index e35127a4cd2e..4f6ad9ef5886 100644 | 68 | =================================================================== |
69 | --- a/src/libsystemd/sd-netlink/netlink-types.c | 69 | --- systemd-stable.orig/src/libsystemd/sd-netlink/netlink-types.c |
70 | +++ b/src/libsystemd/sd-netlink/netlink-types.c | 70 | +++ systemd-stable/src/libsystemd/sd-netlink/netlink-types.c |
71 | @@ -3,6 +3,7 @@ | 71 | @@ -3,6 +3,7 @@ |
72 | #include <netinet/in.h> | 72 | #include <netinet/in.h> |
73 | #include <stdint.h> | 73 | #include <stdint.h> |
@@ -76,10 +76,10 @@ index e35127a4cd2e..4f6ad9ef5886 100644 | |||
76 | #include <linux/can/vxcan.h> | 76 | #include <linux/can/vxcan.h> |
77 | #include <linux/netlink.h> | 77 | #include <linux/netlink.h> |
78 | #include <linux/rtnetlink.h> | 78 | #include <linux/rtnetlink.h> |
79 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c | 79 | Index: systemd-stable/src/machine/machine-dbus.c |
80 | index a2990452af17..5af350883c28 100644 | 80 | =================================================================== |
81 | --- a/src/machine/machine-dbus.c | 81 | --- systemd-stable.orig/src/machine/machine-dbus.c |
82 | +++ b/src/machine/machine-dbus.c | 82 | +++ systemd-stable/src/machine/machine-dbus.c |
83 | @@ -3,6 +3,7 @@ | 83 | @@ -3,6 +3,7 @@ |
84 | #include <errno.h> | 84 | #include <errno.h> |
85 | #include <sys/mount.h> | 85 | #include <sys/mount.h> |
@@ -88,21 +88,21 @@ index a2990452af17..5af350883c28 100644 | |||
88 | 88 | ||
89 | /* When we include libgen.h because we need dirname() we immediately | 89 | /* When we include libgen.h because we need dirname() we immediately |
90 | * undefine basename() since libgen.h defines it as a macro to the POSIX | 90 | * undefine basename() since libgen.h defines it as a macro to the POSIX |
91 | diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c | 91 | Index: systemd-stable/src/network/netdev/bond.c |
92 | index 8df39e35843f..8d697894f970 100644 | 92 | =================================================================== |
93 | --- a/src/network/netdev/bond.c | 93 | --- systemd-stable.orig/src/network/netdev/bond.c |
94 | +++ b/src/network/netdev/bond.c | 94 | +++ systemd-stable/src/network/netdev/bond.c |
95 | @@ -1,5 +1,6 @@ | 95 | @@ -1,5 +1,6 @@ |
96 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 96 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
97 | 97 | ||
98 | +#include <netinet/if_ether.h> | 98 | +#include <netinet/if_ether.h> |
99 | #include "alloc-util.h" | 99 | #include "alloc-util.h" |
100 | #include "bond.h" | 100 | #include "bond.h" |
101 | #include "conf-parser.h" | 101 | #include "bond-util.h" |
102 | diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c | 102 | Index: systemd-stable/src/network/netdev/bridge.c |
103 | index 6b8f9944612e..7f81ec25c407 100644 | 103 | =================================================================== |
104 | --- a/src/network/netdev/bridge.c | 104 | --- systemd-stable.orig/src/network/netdev/bridge.c |
105 | +++ b/src/network/netdev/bridge.c | 105 | +++ systemd-stable/src/network/netdev/bridge.c |
106 | @@ -1,5 +1,6 @@ | 106 | @@ -1,5 +1,6 @@ |
107 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 107 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
108 | 108 | ||
@@ -110,10 +110,10 @@ index 6b8f9944612e..7f81ec25c407 100644 | |||
110 | #include <net/if.h> | 110 | #include <net/if.h> |
111 | 111 | ||
112 | #include "bridge.h" | 112 | #include "bridge.h" |
113 | diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c | 113 | Index: systemd-stable/src/network/netdev/macsec.c |
114 | index 7d1fec3afe6d..e948a335336d 100644 | 114 | =================================================================== |
115 | --- a/src/network/netdev/macsec.c | 115 | --- systemd-stable.orig/src/network/netdev/macsec.c |
116 | +++ b/src/network/netdev/macsec.c | 116 | +++ systemd-stable/src/network/netdev/macsec.c |
117 | @@ -1,5 +1,6 @@ | 117 | @@ -1,5 +1,6 @@ |
118 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 118 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
119 | 119 | ||
@@ -121,10 +121,10 @@ index 7d1fec3afe6d..e948a335336d 100644 | |||
121 | #include <netinet/in.h> | 121 | #include <netinet/in.h> |
122 | #include <linux/if_ether.h> | 122 | #include <linux/if_ether.h> |
123 | #include <linux/if_macsec.h> | 123 | #include <linux/if_macsec.h> |
124 | diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf | 124 | Index: systemd-stable/src/network/netdev/netdev-gperf.gperf |
125 | index 09a5f4822e03..873299b1f98a 100644 | 125 | =================================================================== |
126 | --- a/src/network/netdev/netdev-gperf.gperf | 126 | --- systemd-stable.orig/src/network/netdev/netdev-gperf.gperf |
127 | +++ b/src/network/netdev/netdev-gperf.gperf | 127 | +++ systemd-stable/src/network/netdev/netdev-gperf.gperf |
128 | @@ -2,6 +2,7 @@ | 128 | @@ -2,6 +2,7 @@ |
129 | #if __GNUC__ >= 7 | 129 | #if __GNUC__ >= 7 |
130 | _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") | 130 | _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") |
@@ -133,21 +133,21 @@ index 09a5f4822e03..873299b1f98a 100644 | |||
133 | #include <stddef.h> | 133 | #include <stddef.h> |
134 | #include "bond.h" | 134 | #include "bond.h" |
135 | #include "bridge.h" | 135 | #include "bridge.h" |
136 | diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c | 136 | Index: systemd-stable/src/network/netdev/netdev.c |
137 | index f8121a48ed92..437f411c61e8 100644 | 137 | =================================================================== |
138 | --- a/src/network/netdev/netdev.c | 138 | --- systemd-stable.orig/src/network/netdev/netdev.c |
139 | +++ b/src/network/netdev/netdev.c | 139 | +++ systemd-stable/src/network/netdev/netdev.c |
140 | @@ -1,5 +1,6 @@ | 140 | @@ -1,5 +1,6 @@ |
141 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 141 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
142 | 142 | ||
143 | +#include <netinet/if_ether.h> | 143 | +#include <netinet/if_ether.h> |
144 | #include <net/if.h> | 144 | #include <net/if.h> |
145 | #include <netinet/in.h> | 145 | #include <netinet/in.h> |
146 | 146 | #include <unistd.h> | |
147 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c | 147 | Index: systemd-stable/src/network/networkd-brvlan.c |
148 | index 41f09287f2b7..b67ce4fc8844 100644 | 148 | =================================================================== |
149 | --- a/src/network/networkd-brvlan.c | 149 | --- systemd-stable.orig/src/network/networkd-brvlan.c |
150 | +++ b/src/network/networkd-brvlan.c | 150 | +++ systemd-stable/src/network/networkd-brvlan.c |
151 | @@ -4,6 +4,7 @@ | 151 | @@ -4,6 +4,7 @@ |
152 | ***/ | 152 | ***/ |
153 | 153 | ||
@@ -156,11 +156,11 @@ index 41f09287f2b7..b67ce4fc8844 100644 | |||
156 | #include <linux/if_bridge.h> | 156 | #include <linux/if_bridge.h> |
157 | #include <stdbool.h> | 157 | #include <stdbool.h> |
158 | 158 | ||
159 | diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c | 159 | Index: systemd-stable/src/network/networkd-dhcp-common.c |
160 | index 8664d8cdc0d4..e9f91f74c1a1 100644 | 160 | =================================================================== |
161 | --- a/src/network/networkd-dhcp-common.c | 161 | --- systemd-stable.orig/src/network/networkd-dhcp-common.c |
162 | +++ b/src/network/networkd-dhcp-common.c | 162 | +++ systemd-stable/src/network/networkd-dhcp-common.c |
163 | @@ -4,6 +4,7 @@ | 163 | @@ -5,6 +5,7 @@ |
164 | #include "escape.h" | 164 | #include "escape.h" |
165 | #include "in-addr-util.h" | 165 | #include "in-addr-util.h" |
166 | #include "networkd-dhcp-common.h" | 166 | #include "networkd-dhcp-common.h" |
@@ -168,10 +168,10 @@ index 8664d8cdc0d4..e9f91f74c1a1 100644 | |||
168 | #include "networkd-network.h" | 168 | #include "networkd-network.h" |
169 | #include "parse-util.h" | 169 | #include "parse-util.h" |
170 | #include "string-table.h" | 170 | #include "string-table.h" |
171 | diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c | 171 | Index: systemd-stable/src/network/networkd-dhcp4.c |
172 | index 13e3e32f40e8..5394399c9150 100644 | 172 | =================================================================== |
173 | --- a/src/network/networkd-dhcp4.c | 173 | --- systemd-stable.orig/src/network/networkd-dhcp4.c |
174 | +++ b/src/network/networkd-dhcp4.c | 174 | +++ systemd-stable/src/network/networkd-dhcp4.c |
175 | @@ -1,9 +1,9 @@ | 175 | @@ -1,9 +1,9 @@ |
176 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 176 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
177 | 177 | ||
@@ -181,12 +181,12 @@ index 13e3e32f40e8..5394399c9150 100644 | |||
181 | #include <linux/if.h> | 181 | #include <linux/if.h> |
182 | -#include <linux/if_arp.h> | 182 | -#include <linux/if_arp.h> |
183 | 183 | ||
184 | #include "escape.h" | ||
184 | #include "alloc-util.h" | 185 | #include "alloc-util.h" |
185 | #include "dhcp-client-internal.h" | 186 | Index: systemd-stable/src/network/networkd-dhcp6.c |
186 | diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c | 187 | =================================================================== |
187 | index 7304270c60b1..099064f64715 100644 | 188 | --- systemd-stable.orig/src/network/networkd-dhcp6.c |
188 | --- a/src/network/networkd-dhcp6.c | 189 | +++ systemd-stable/src/network/networkd-dhcp6.c |
189 | +++ b/src/network/networkd-dhcp6.c | ||
190 | @@ -3,9 +3,9 @@ | 190 | @@ -3,9 +3,9 @@ |
191 | Copyright © 2014 Intel Corporation. All rights reserved. | 191 | Copyright © 2014 Intel Corporation. All rights reserved. |
192 | ***/ | 192 | ***/ |
@@ -195,13 +195,13 @@ index 7304270c60b1..099064f64715 100644 | |||
195 | #include <netinet/in.h> | 195 | #include <netinet/in.h> |
196 | #include <linux/if.h> | 196 | #include <linux/if.h> |
197 | -#include <linux/if_arp.h> | 197 | -#include <linux/if_arp.h> |
198 | #include "sd-radv.h" | ||
199 | 198 | ||
200 | #include "sd-dhcp6-client.h" | 199 | #include "sd-dhcp6-client.h" |
201 | diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c | 200 | |
202 | index 99d4b29c31ec..e8b467d6ac09 100644 | 201 | Index: systemd-stable/src/network/networkd-link.c |
203 | --- a/src/network/networkd-link.c | 202 | =================================================================== |
204 | +++ b/src/network/networkd-link.c | 203 | --- systemd-stable.orig/src/network/networkd-link.c |
204 | +++ systemd-stable/src/network/networkd-link.c | ||
205 | @@ -1,8 +1,8 @@ | 205 | @@ -1,8 +1,8 @@ |
206 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 206 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
207 | 207 | ||
@@ -209,13 +209,13 @@ index 99d4b29c31ec..e8b467d6ac09 100644 | |||
209 | #include <netinet/in.h> | 209 | #include <netinet/in.h> |
210 | #include <linux/if.h> | 210 | #include <linux/if.h> |
211 | -#include <linux/if_arp.h> | 211 | -#include <linux/if_arp.h> |
212 | #include <linux/if_link.h> | ||
212 | #include <unistd.h> | 213 | #include <unistd.h> |
213 | 214 | ||
214 | #include "alloc-util.h" | 215 | Index: systemd-stable/src/network/networkd-network.c |
215 | diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c | 216 | =================================================================== |
216 | index 2e716b291e97..56f18cea57fe 100644 | 217 | --- systemd-stable.orig/src/network/networkd-network.c |
217 | --- a/src/network/networkd-network.c | 218 | +++ systemd-stable/src/network/networkd-network.c |
218 | +++ b/src/network/networkd-network.c | ||
219 | @@ -1,5 +1,6 @@ | 219 | @@ -1,5 +1,6 @@ |
220 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 220 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
221 | 221 | ||
@@ -223,19 +223,19 @@ index 2e716b291e97..56f18cea57fe 100644 | |||
223 | #include <net/if.h> | 223 | #include <net/if.h> |
224 | #include <netinet/in.h> | 224 | #include <netinet/in.h> |
225 | #include <linux/netdevice.h> | 225 | #include <linux/netdevice.h> |
226 | diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c | 226 | Index: systemd-stable/src/network/test-network-tables.c |
227 | index 25b939639775..530e4928835c 100644 | 227 | =================================================================== |
228 | --- a/src/network/test-network-tables.c | 228 | --- systemd-stable.orig/src/network/test-network-tables.c |
229 | +++ b/src/network/test-network-tables.c | 229 | +++ systemd-stable/src/network/test-network-tables.c |
230 | @@ -1,3 +1,4 @@ | 230 | @@ -1,3 +1,4 @@ |
231 | +#include <netinet/if_ether.h> | 231 | +#include <netinet/if_ether.h> |
232 | #include "bond.h" | 232 | #include "bond.h" |
233 | #include "dhcp6-internal.h" | 233 | #include "dhcp6-internal.h" |
234 | #include "dhcp6-protocol.h" | 234 | #include "dhcp6-protocol.h" |
235 | diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c | 235 | Index: systemd-stable/src/shared/ethtool-util.c |
236 | index 00a71d64a638..4593e89120b8 100644 | 236 | =================================================================== |
237 | --- a/src/shared/ethtool-util.c | 237 | --- systemd-stable.orig/src/shared/ethtool-util.c |
238 | +++ b/src/shared/ethtool-util.c | 238 | +++ systemd-stable/src/shared/ethtool-util.c |
239 | @@ -1,5 +1,6 @@ | 239 | @@ -1,5 +1,6 @@ |
240 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 240 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
241 | 241 | ||
@@ -243,10 +243,10 @@ index 00a71d64a638..4593e89120b8 100644 | |||
243 | #include <net/if.h> | 243 | #include <net/if.h> |
244 | #include <sys/ioctl.h> | 244 | #include <sys/ioctl.h> |
245 | #include <linux/ethtool.h> | 245 | #include <linux/ethtool.h> |
246 | diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h | 246 | Index: systemd-stable/src/shared/ethtool-util.h |
247 | index c1d5d7590ef9..b3e018bf76e9 100644 | 247 | =================================================================== |
248 | --- a/src/shared/ethtool-util.h | 248 | --- systemd-stable.orig/src/shared/ethtool-util.h |
249 | +++ b/src/shared/ethtool-util.h | 249 | +++ systemd-stable/src/shared/ethtool-util.h |
250 | @@ -3,6 +3,7 @@ | 250 | @@ -3,6 +3,7 @@ |
251 | 251 | ||
252 | #include <macro.h> | 252 | #include <macro.h> |
@@ -255,21 +255,21 @@ index c1d5d7590ef9..b3e018bf76e9 100644 | |||
255 | #include <linux/ethtool.h> | 255 | #include <linux/ethtool.h> |
256 | 256 | ||
257 | #include "conf-parser.h" | 257 | #include "conf-parser.h" |
258 | diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c | 258 | Index: systemd-stable/src/udev/net/link-config.c |
259 | index 0332e99269c9..ff3aead4a779 100644 | 259 | =================================================================== |
260 | --- a/src/udev/net/link-config.c | 260 | --- systemd-stable.orig/src/udev/net/link-config.c |
261 | +++ b/src/udev/net/link-config.c | 261 | +++ systemd-stable/src/udev/net/link-config.c |
262 | @@ -1,5 +1,6 @@ | 262 | @@ -1,5 +1,6 @@ |
263 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 263 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
264 | 264 | ||
265 | +#include <netinet/if_ether.h> | 265 | +#include <netinet/if_ether.h> |
266 | #include <linux/netdevice.h> | 266 | #include <linux/netdevice.h> |
267 | #include <netinet/ether.h> | 267 | #include <netinet/ether.h> |
268 | 268 | #include <unistd.h> | |
269 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c | 269 | Index: systemd-stable/src/udev/udev-builtin-net_setup_link.c |
270 | index ee3ca9fa3846..9aa4e828741f 100644 | 270 | =================================================================== |
271 | --- a/src/udev/udev-builtin-net_setup_link.c | 271 | --- systemd-stable.orig/src/udev/udev-builtin-net_setup_link.c |
272 | +++ b/src/udev/udev-builtin-net_setup_link.c | 272 | +++ systemd-stable/src/udev/udev-builtin-net_setup_link.c |
273 | @@ -1,5 +1,6 @@ | 273 | @@ -1,5 +1,6 @@ |
274 | /* SPDX-License-Identifier: LGPL-2.1+ */ | 274 | /* SPDX-License-Identifier: LGPL-2.1+ */ |
275 | 275 | ||