summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
diff options
context:
space:
mode:
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.patch56
1 files changed, 27 insertions, 29 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 a978558b42..54d714266e 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,7 +1,7 @@
1From d3ed0da271738fd0fc3d3e4d82d6f5810334b05e Mon Sep 17 00:00:00 2001 1From 2069f0b0d5ab8f869aeba635a347e0b11d362b30 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 26 Oct 2017 22:10:42 -0700 3Date: Thu, 26 Oct 2017 22:10:42 -0700
4Subject: [PATCH 06/26] Include netinet/if_ether.h 4Subject: [PATCH] Include netinet/if_ether.h
5 5
6Fixes 6Fixes
7/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' 7/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr'
@@ -31,6 +31,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
31Signed-off-by: Scott Murray <scott.murray@konsulko.com> 31Signed-off-by: Scott Murray <scott.murray@konsulko.com>
32[rebased for systemd 247] 32[rebased for systemd 247]
33Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com> 33Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
34
34--- 35---
35 src/libsystemd-network/sd-dhcp6-client.c | 1 - 36 src/libsystemd-network/sd-dhcp6-client.c | 1 -
36 src/libsystemd/sd-netlink/netlink-types.c | 1 + 37 src/libsystemd/sd-netlink/netlink-types.c | 1 +
@@ -56,7 +57,7 @@ Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
56 21 files changed, 26 insertions(+), 8 deletions(-) 57 21 files changed, 26 insertions(+), 8 deletions(-)
57 58
58diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c 59diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
59index 66f87c4b95..de1264ae46 100644 60index 410bfda10e..e70ed8be92 100644
60--- a/src/libsystemd-network/sd-dhcp6-client.c 61--- a/src/libsystemd-network/sd-dhcp6-client.c
61+++ b/src/libsystemd-network/sd-dhcp6-client.c 62+++ b/src/libsystemd-network/sd-dhcp6-client.c
62@@ -5,7 +5,6 @@ 63@@ -5,7 +5,6 @@
@@ -68,7 +69,7 @@ index 66f87c4b95..de1264ae46 100644
68 69
69 #include "sd-dhcp6-client.h" 70 #include "sd-dhcp6-client.h"
70diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c 71diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
71index 6fb6c147d9..8eda02d202 100644 72index ed7b9a8cd1..112c0b09e4 100644
72--- a/src/libsystemd/sd-netlink/netlink-types.c 73--- a/src/libsystemd/sd-netlink/netlink-types.c
73+++ b/src/libsystemd/sd-netlink/netlink-types.c 74+++ b/src/libsystemd/sd-netlink/netlink-types.c
74@@ -3,6 +3,7 @@ 75@@ -3,6 +3,7 @@
@@ -80,7 +81,7 @@ index 6fb6c147d9..8eda02d202 100644
80 #include <linux/netlink.h> 81 #include <linux/netlink.h>
81 #include <linux/rtnetlink.h> 82 #include <linux/rtnetlink.h>
82diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c 83diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
83index bb67beb665..f5780f1aec 100644 84index e7c4ed3c7c..3a1e4f9072 100644
84--- a/src/machine/machine-dbus.c 85--- a/src/machine/machine-dbus.c
85+++ b/src/machine/machine-dbus.c 86+++ b/src/machine/machine-dbus.c
86@@ -3,6 +3,7 @@ 87@@ -3,6 +3,7 @@
@@ -92,7 +93,7 @@ index bb67beb665..f5780f1aec 100644
92 /* When we include libgen.h because we need dirname() we immediately 93 /* When we include libgen.h because we need dirname() we immediately
93 * undefine basename() since libgen.h defines it as a macro to the POSIX 94 * undefine basename() since libgen.h defines it as a macro to the POSIX
94diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c 95diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
95index e27f36067b..8868f1da5d 100644 96index cf7ca88d6f..34ab468191 100644
96--- a/src/network/netdev/bond.c 97--- a/src/network/netdev/bond.c
97+++ b/src/network/netdev/bond.c 98+++ b/src/network/netdev/bond.c
98@@ -1,5 +1,6 @@ 99@@ -1,5 +1,6 @@
@@ -103,7 +104,7 @@ index e27f36067b..8868f1da5d 100644
103 #include "bond.h" 104 #include "bond.h"
104 #include "bond-util.h" 105 #include "bond-util.h"
105diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c 106diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
106index 1f59cd8b42..5fdbae7e99 100644 107index 38432f1578..79ccfe578e 100644
107--- a/src/network/netdev/bridge.c 108--- a/src/network/netdev/bridge.c
108+++ b/src/network/netdev/bridge.c 109+++ b/src/network/netdev/bridge.c
109@@ -1,5 +1,6 @@ 110@@ -1,5 +1,6 @@
@@ -114,7 +115,7 @@ index 1f59cd8b42..5fdbae7e99 100644
114 115
115 #include "bridge.h" 116 #include "bridge.h"
116diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c 117diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
117index 82e71c3920..fbae86e216 100644 118index 77c5f8c4e7..04be1b4ab2 100644
118--- a/src/network/netdev/macsec.c 119--- a/src/network/netdev/macsec.c
119+++ b/src/network/netdev/macsec.c 120+++ b/src/network/netdev/macsec.c
120@@ -1,5 +1,6 @@ 121@@ -1,5 +1,6 @@
@@ -125,19 +126,19 @@ index 82e71c3920..fbae86e216 100644
125 #include <linux/if_ether.h> 126 #include <linux/if_ether.h>
126 #include <linux/if_macsec.h> 127 #include <linux/if_macsec.h>
127diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf 128diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
128index 4e89761f2c..91251fa6ec 100644 129index 8abe044890..3c54c58928 100644
129--- a/src/network/netdev/netdev-gperf.gperf 130--- a/src/network/netdev/netdev-gperf.gperf
130+++ b/src/network/netdev/netdev-gperf.gperf 131+++ b/src/network/netdev/netdev-gperf.gperf
131@@ -2,6 +2,7 @@ 132@@ -3,6 +3,7 @@
132 #if __GNUC__ >= 7 133 #if __GNUC__ >= 7
133 _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") 134 _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
134 #endif 135 #endif
135+#include <netinet/if_ether.h> 136+#include <netinet/if_ether.h>
136 #include <stddef.h> 137 #include <stddef.h>
137 #include "bareudp.h" 138 #include "bareudp.h"
138 #include "bond.h" 139 #include "batadv.h"
139diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c 140diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
140index 9f390b5781..62aeafb1e4 100644 141index b31f0fa81a..c80e1ff537 100644
141--- a/src/network/netdev/netdev.c 142--- a/src/network/netdev/netdev.c
142+++ b/src/network/netdev/netdev.c 143+++ b/src/network/netdev/netdev.c
143@@ -1,5 +1,6 @@ 144@@ -1,5 +1,6 @@
@@ -148,7 +149,7 @@ index 9f390b5781..62aeafb1e4 100644
148 #include <netinet/in.h> 149 #include <netinet/in.h>
149 #include <unistd.h> 150 #include <unistd.h>
150diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c 151diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
151index e53c73c30c..9bf0771b84 100644 152index 2847b336c9..4d6af8c642 100644
152--- a/src/network/networkd-brvlan.c 153--- a/src/network/networkd-brvlan.c
153+++ b/src/network/networkd-brvlan.c 154+++ b/src/network/networkd-brvlan.c
154@@ -4,6 +4,7 @@ 155@@ -4,6 +4,7 @@
@@ -160,7 +161,7 @@ index e53c73c30c..9bf0771b84 100644
160 #include <stdbool.h> 161 #include <stdbool.h>
161 162
162diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c 163diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
163index 9f58121350..554d006cb8 100644 164index 00d055cf8d..65821c1d31 100644
164--- a/src/network/networkd-dhcp-common.c 165--- a/src/network/networkd-dhcp-common.c
165+++ b/src/network/networkd-dhcp-common.c 166+++ b/src/network/networkd-dhcp-common.c
166@@ -1,7 +1,8 @@ 167@@ -1,7 +1,8 @@
@@ -171,9 +172,9 @@ index 9f58121350..554d006cb8 100644
171+#include <net/if_arp.h> 172+#include <net/if_arp.h>
172+#include <net/if.h> 173+#include <net/if.h>
173 174
175 #include "bus-error.h"
174 #include "dhcp-internal.h" 176 #include "dhcp-internal.h"
175 #include "dhcp6-internal.h" 177@@ -11,6 +12,7 @@
176@@ -10,6 +11,7 @@
177 #include "networkd-dhcp-common.h" 178 #include "networkd-dhcp-common.h"
178 #include "networkd-link.h" 179 #include "networkd-link.h"
179 #include "networkd-manager.h" 180 #include "networkd-manager.h"
@@ -182,7 +183,7 @@ index 9f58121350..554d006cb8 100644
182 #include "parse-util.h" 183 #include "parse-util.h"
183 #include "socket-util.h" 184 #include "socket-util.h"
184diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c 185diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
185index cf279c640d..bae541029b 100644 186index 5cdf432c27..93cffb9863 100644
186--- a/src/network/networkd-dhcp-server.c 187--- a/src/network/networkd-dhcp-server.c
187+++ b/src/network/networkd-dhcp-server.c 188+++ b/src/network/networkd-dhcp-server.c
188@@ -1,8 +1,8 @@ 189@@ -1,8 +1,8 @@
@@ -197,7 +198,7 @@ index cf279c640d..bae541029b 100644
197 #include "sd-dhcp-server.h" 198 #include "sd-dhcp-server.h"
198 199
199diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c 200diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
200index f3c1e5f609..e4ef6eca63 100644 201index 23dc3a45db..7ae6c2467a 100644
201--- a/src/network/networkd-dhcp4.c 202--- a/src/network/networkd-dhcp4.c
202+++ b/src/network/networkd-dhcp4.c 203+++ b/src/network/networkd-dhcp4.c
203@@ -1,9 +1,9 @@ 204@@ -1,9 +1,9 @@
@@ -212,7 +213,7 @@ index f3c1e5f609..e4ef6eca63 100644
212 #include "escape.h" 213 #include "escape.h"
213 #include "alloc-util.h" 214 #include "alloc-util.h"
214diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c 215diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
215index 5c077c1ec8..fa98042aa5 100644 216index aa077d6219..4f6ce22059 100644
216--- a/src/network/networkd-dhcp6.c 217--- a/src/network/networkd-dhcp6.c
217+++ b/src/network/networkd-dhcp6.c 218+++ b/src/network/networkd-dhcp6.c
218@@ -3,9 +3,9 @@ 219@@ -3,9 +3,9 @@
@@ -227,7 +228,7 @@ index 5c077c1ec8..fa98042aa5 100644
227 #include "sd-dhcp6-client.h" 228 #include "sd-dhcp6-client.h"
228 229
229diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c 230diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
230index 3bfe636691..e0c68c8ad3 100644 231index 8219d95b0d..c92230453b 100644
231--- a/src/network/networkd-link.c 232--- a/src/network/networkd-link.c
232+++ b/src/network/networkd-link.c 233+++ b/src/network/networkd-link.c
233@@ -1,8 +1,8 @@ 234@@ -1,8 +1,8 @@
@@ -241,7 +242,7 @@ index 3bfe636691..e0c68c8ad3 100644
241 #include <unistd.h> 242 #include <unistd.h>
242 243
243diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c 244diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
244index 3254641461..f0ada419fd 100644 245index e5ffd35b6f..871ebb32c6 100644
245--- a/src/network/networkd-network.c 246--- a/src/network/networkd-network.c
246+++ b/src/network/networkd-network.c 247+++ b/src/network/networkd-network.c
247@@ -1,5 +1,6 @@ 248@@ -1,5 +1,6 @@
@@ -252,7 +253,7 @@ index 3254641461..f0ada419fd 100644
252 #include <netinet/in.h> 253 #include <netinet/in.h>
253 #include <linux/netdevice.h> 254 #include <linux/netdevice.h>
254diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c 255diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
255index 0ed89584ef..e7e157c201 100644 256index a74541a6c9..a10549b336 100644
256--- a/src/network/networkd-route.c 257--- a/src/network/networkd-route.c
257+++ b/src/network/networkd-route.c 258+++ b/src/network/networkd-route.c
258@@ -1,7 +1,10 @@ 259@@ -1,7 +1,10 @@
@@ -268,7 +269,7 @@ index 0ed89584ef..e7e157c201 100644
268 #include "alloc-util.h" 269 #include "alloc-util.h"
269 #include "netlink-util.h" 270 #include "netlink-util.h"
270diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c 271diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
271index 475cac7527..9bae6eda16 100644 272index ce34449554..0b5dc01182 100644
272--- a/src/network/test-network-tables.c 273--- a/src/network/test-network-tables.c
273+++ b/src/network/test-network-tables.c 274+++ b/src/network/test-network-tables.c
274@@ -1,5 +1,6 @@ 275@@ -1,5 +1,6 @@
@@ -279,7 +280,7 @@ index 475cac7527..9bae6eda16 100644
279 #include "dhcp6-internal.h" 280 #include "dhcp6-internal.h"
280 #include "dhcp6-protocol.h" 281 #include "dhcp6-protocol.h"
281diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c 282diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
282index e6fab262f2..41dd3d7df7 100644 283index 654d36a83a..f4ed42d543 100644
283--- a/src/shared/ethtool-util.c 284--- a/src/shared/ethtool-util.c
284+++ b/src/shared/ethtool-util.c 285+++ b/src/shared/ethtool-util.c
285@@ -1,5 +1,6 @@ 286@@ -1,5 +1,6 @@
@@ -290,7 +291,7 @@ index e6fab262f2..41dd3d7df7 100644
290 #include <sys/ioctl.h> 291 #include <sys/ioctl.h>
291 #include <linux/ethtool.h> 292 #include <linux/ethtool.h>
292diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h 293diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h
293index f94b3e15bf..08a7e4fa09 100644 294index 11e2906681..a171df0737 100644
294--- a/src/shared/ethtool-util.h 295--- a/src/shared/ethtool-util.h
295+++ b/src/shared/ethtool-util.h 296+++ b/src/shared/ethtool-util.h
296@@ -3,6 +3,7 @@ 297@@ -3,6 +3,7 @@
@@ -302,7 +303,7 @@ index f94b3e15bf..08a7e4fa09 100644
302 303
303 #include "conf-parser.h" 304 #include "conf-parser.h"
304diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c 305diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
305index d12fd0e299..636806dc23 100644 306index 31e5d0cd67..f25f821364 100644
306--- a/src/udev/net/link-config.c 307--- a/src/udev/net/link-config.c
307+++ b/src/udev/net/link-config.c 308+++ b/src/udev/net/link-config.c
308@@ -1,5 +1,6 @@ 309@@ -1,5 +1,6 @@
@@ -323,6 +324,3 @@ index 87e1fb133e..13876029d0 100644
323 #include "alloc-util.h" 324 #include "alloc-util.h"
324 #include "device-util.h" 325 #include "device-util.h"
325 #include "errno-util.h" 326 #include "errno-util.h"
326--
3272.25.1
328
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-30 07:47:15 +0000