summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
diff options
context:
space:
mode:
authorAlex Kiernan <alex.kiernan@gmail.com>2020-02-06 16:48:13 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-02-08 13:20:02 +0000
commit306820bad60c62a8096df8d1e4c7cc8e00dc38b7 (patch)
tree78fe9e9d90e19ca52f2cc462e1368e90484d4b4d /meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
parentcc7164836097a4100dce65e93b24a3a8874f65b3 (diff)
downloadpoky-306820bad60c62a8096df8d1e4c7cc8e00dc38b7.tar.gz
systemd: upgrade 243.4 -> 244.1
Drop 0002-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch a variant on which was introduced in 2c1047310970 ("Upgrade to systemd 211+") in 2014. The oldest supported build machine is now CentOS 7 which has --relative support in ln, so there no longer appears to be any need for this change. Rebase/refresh musl patches: - replace missing.h with specific missing_... header - fix additional WRITE_STRING_FILE_DISABLE_BUFFER - fix more places that need netinet/if_ether.h (From OE-Core rev: 44a4ac2294da0f53cbbfabc7ece836fe97f4d3f7) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch101
1 files changed, 76 insertions, 25 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 6d73d715ce..ea003fd7da 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,4 +1,7 @@
1Include netinet/if_ether.h 1From 3932ce7f6c8ace5e1210aad20e1a141cb29329b1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 26 Oct 2017 22:10:42 -0700
4Subject: [PATCH] Include netinet/if_ether.h
2 5
3Fixes 6Fixes
4/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'
@@ -26,11 +29,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
26Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 29Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
27[rebased for systemd 243] 30[rebased for systemd 243]
28Signed-off-by: Scott Murray <scott.murray@konsulko.com> 31Signed-off-by: Scott Murray <scott.murray@konsulko.com>
32
29--- 33---
30 src/libsystemd-network/sd-dhcp6-client.c | 1 - 34 src/libsystemd-network/sd-dhcp6-client.c | 1 -
31 src/libsystemd/sd-netlink/netlink-types.c | 1 + 35 src/libsystemd/sd-netlink/netlink-types.c | 1 +
32 src/machine/machine-dbus.c | 1 + 36 src/machine/machine-dbus.c | 1 +
37 src/network/netdev/bond.c | 1 +
38 src/network/netdev/bridge.c | 1 +
33 src/network/netdev/macsec.c | 1 + 39 src/network/netdev/macsec.c | 1 +
40 src/network/netdev/netdev-gperf.gperf | 1 +
34 src/network/netdev/netdev.c | 1 + 41 src/network/netdev/netdev.c | 1 +
35 src/network/networkd-brvlan.c | 1 + 42 src/network/networkd-brvlan.c | 1 +
36 src/network/networkd-dhcp-common.c | 1 + 43 src/network/networkd-dhcp-common.c | 1 +
@@ -38,26 +45,27 @@ Signed-off-by: Scott Murray <scott.murray@konsulko.com>
38 src/network/networkd-dhcp6.c | 2 +- 45 src/network/networkd-dhcp6.c | 2 +-
39 src/network/networkd-link.c | 2 +- 46 src/network/networkd-link.c | 2 +-
40 src/network/networkd-network.c | 1 + 47 src/network/networkd-network.c | 1 +
48 src/network/test-network-tables.c | 1 +
41 src/shared/ethtool-util.c | 1 + 49 src/shared/ethtool-util.c | 1 +
42 src/shared/ethtool-util.h | 1 + 50 src/shared/ethtool-util.h | 1 +
43 src/udev/net/link-config.c | 1 + 51 src/udev/net/link-config.c | 1 +
44 src/udev/udev-builtin-net_setup_link.c | 1 + 52 src/udev/udev-builtin-net_setup_link.c | 1 +
45 15 files changed, 14 insertions(+), 4 deletions(-) 53 19 files changed, 18 insertions(+), 4 deletions(-)
46 54
47diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c 55diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
48index d7a5349c70..68b41dfb6c 100644 56index 5417ba8c5feb..d3aba928dd96 100644
49--- a/src/libsystemd-network/sd-dhcp6-client.c 57--- a/src/libsystemd-network/sd-dhcp6-client.c
50+++ b/src/libsystemd-network/sd-dhcp6-client.c 58+++ b/src/libsystemd-network/sd-dhcp6-client.c
51@@ -6,7 +6,6 @@ 59@@ -5,7 +5,6 @@
60
52 #include <errno.h> 61 #include <errno.h>
53 #include <string.h>
54 #include <sys/ioctl.h> 62 #include <sys/ioctl.h>
55-#include <linux/if_arp.h> 63-#include <linux/if_arp.h>
56 #include <linux/if_infiniband.h> 64 #include <linux/if_infiniband.h>
57 65
58 #include "sd-dhcp6-client.h" 66 #include "sd-dhcp6-client.h"
59diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c 67diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
60index de9b8b21ab..f64f6500f7 100644 68index a55460f03407..6f9cd527c800 100644
61--- a/src/libsystemd/sd-netlink/netlink-types.c 69--- a/src/libsystemd/sd-netlink/netlink-types.c
62+++ b/src/libsystemd/sd-netlink/netlink-types.c 70+++ b/src/libsystemd/sd-netlink/netlink-types.c
63@@ -3,6 +3,7 @@ 71@@ -3,6 +3,7 @@
@@ -69,19 +77,41 @@ index de9b8b21ab..f64f6500f7 100644
69 #include <linux/netlink.h> 77 #include <linux/netlink.h>
70 #include <linux/rtnetlink.h> 78 #include <linux/rtnetlink.h>
71diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c 79diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
72index 0d58b5eb8b..01093c1f62 100644 80index 3b2ac3829859..760ccb445cd0 100644
73--- a/src/machine/machine-dbus.c 81--- a/src/machine/machine-dbus.c
74+++ b/src/machine/machine-dbus.c 82+++ b/src/machine/machine-dbus.c
75@@ -4,6 +4,7 @@ 83@@ -3,6 +3,7 @@
76 #include <string.h> 84 #include <errno.h>
77 #include <sys/mount.h> 85 #include <sys/mount.h>
78 #include <sys/wait.h> 86 #include <sys/wait.h>
79+#include <netinet/if_ether.h> 87+#include <netinet/if_ether.h>
80 88
81 /* When we include libgen.h because we need dirname() we immediately 89 /* 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 90 * undefine basename() since libgen.h defines it as a macro to the POSIX
91diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c
92index 185b155440e7..dc1cd236c814 100644
93--- a/src/network/netdev/bond.c
94+++ b/src/network/netdev/bond.c
95@@ -1,5 +1,6 @@
96 /* SPDX-License-Identifier: LGPL-2.1+ */
97
98+#include <netinet/if_ether.h>
99 #include "alloc-util.h"
100 #include "bond.h"
101 #include "conf-parser.h"
102diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
103index 59a40faef8fa..8e821a3216b3 100644
104--- a/src/network/netdev/bridge.c
105+++ b/src/network/netdev/bridge.c
106@@ -1,5 +1,6 @@
107 /* SPDX-License-Identifier: LGPL-2.1+ */
108
109+#include <netinet/if_ether.h>
110 #include <net/if.h>
111
112 #include "bridge.h"
83diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c 113diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c
84index cf281e75a6..269dc618ff 100644 114index 25dc23ff0338..f20d11fbcf53 100644
85--- a/src/network/netdev/macsec.c 115--- a/src/network/netdev/macsec.c
86+++ b/src/network/netdev/macsec.c 116+++ b/src/network/netdev/macsec.c
87@@ -1,5 +1,6 @@ 117@@ -1,5 +1,6 @@
@@ -91,8 +121,20 @@ index cf281e75a6..269dc618ff 100644
91 #include <netinet/in.h> 121 #include <netinet/in.h>
92 #include <linux/if_ether.h> 122 #include <linux/if_ether.h>
93 #include <linux/if_macsec.h> 123 #include <linux/if_macsec.h>
124diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf
125index 09a5f4822e03..873299b1f98a 100644
126--- a/src/network/netdev/netdev-gperf.gperf
127+++ b/src/network/netdev/netdev-gperf.gperf
128@@ -2,6 +2,7 @@
129 #if __GNUC__ >= 7
130 _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
131 #endif
132+#include <netinet/if_ether.h>
133 #include <stddef.h>
134 #include "bond.h"
135 #include "bridge.h"
94diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c 136diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
95index 7735b455b7..ed4eda4a44 100644 137index 6908c4e811b0..e0d8c459ab63 100644
96--- a/src/network/netdev/netdev.c 138--- a/src/network/netdev/netdev.c
97+++ b/src/network/netdev/netdev.c 139+++ b/src/network/netdev/netdev.c
98@@ -1,5 +1,6 @@ 140@@ -1,5 +1,6 @@
@@ -103,7 +145,7 @@ index 7735b455b7..ed4eda4a44 100644
103 #include <netinet/in.h> 145 #include <netinet/in.h>
104 146
105diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c 147diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
106index c3c5d535ac..ebea408c89 100644 148index c3c5d535ac66..ebea408c89a8 100644
107--- a/src/network/networkd-brvlan.c 149--- a/src/network/networkd-brvlan.c
108+++ b/src/network/networkd-brvlan.c 150+++ b/src/network/networkd-brvlan.c
109@@ -4,6 +4,7 @@ 151@@ -4,6 +4,7 @@
@@ -115,19 +157,19 @@ index c3c5d535ac..ebea408c89 100644
115 #include <stdbool.h> 157 #include <stdbool.h>
116 158
117diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c 159diff --git a/src/network/networkd-dhcp-common.c b/src/network/networkd-dhcp-common.c
118index 626b975839..42fe92f320 100644 160index 6465a8cfe9c7..bd4b2cdfac15 100644
119--- a/src/network/networkd-dhcp-common.c 161--- a/src/network/networkd-dhcp-common.c
120+++ b/src/network/networkd-dhcp-common.c 162+++ b/src/network/networkd-dhcp-common.c
121@@ -1,6 +1,7 @@ 163@@ -4,6 +4,7 @@
122 /* SPDX-License-Identifier: LGPL-2.1+ */ 164 #include "escape.h"
123 165 #include "in-addr-util.h"
124 #include "networkd-dhcp-common.h" 166 #include "networkd-dhcp-common.h"
125+#include <netinet/if_ether.h> 167+#include <netinet/if_ether.h>
126 #include "networkd-network.h" 168 #include "networkd-network.h"
127 #include "parse-util.h" 169 #include "parse-util.h"
128 #include "string-table.h" 170 #include "string-table.h"
129diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c 171diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
130index 662770b50e..c6ab62a94d 100644 172index 8ca87d99d4db..a66284896cf3 100644
131--- a/src/network/networkd-dhcp4.c 173--- a/src/network/networkd-dhcp4.c
132+++ b/src/network/networkd-dhcp4.c 174+++ b/src/network/networkd-dhcp4.c
133@@ -1,8 +1,8 @@ 175@@ -1,8 +1,8 @@
@@ -139,9 +181,9 @@ index 662770b50e..c6ab62a94d 100644
139-#include <linux/if_arp.h> 181-#include <linux/if_arp.h>
140 182
141 #include "alloc-util.h" 183 #include "alloc-util.h"
142 #include "hostname-util.h" 184 #include "dhcp-client-internal.h"
143diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c 185diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
144index 8ad736a82b..f41b4d834e 100644 186index 647623ac3778..325c641c6231 100644
145--- a/src/network/networkd-dhcp6.c 187--- a/src/network/networkd-dhcp6.c
146+++ b/src/network/networkd-dhcp6.c 188+++ b/src/network/networkd-dhcp6.c
147@@ -3,9 +3,9 @@ 189@@ -3,9 +3,9 @@
@@ -156,7 +198,7 @@ index 8ad736a82b..f41b4d834e 100644
156 198
157 #include "sd-dhcp6-client.h" 199 #include "sd-dhcp6-client.h"
158diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c 200diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
159index f5bb78890a..f13a36b791 100644 201index 2e60adbf7818..05aa8672d585 100644
160--- a/src/network/networkd-link.c 202--- a/src/network/networkd-link.c
161+++ b/src/network/networkd-link.c 203+++ b/src/network/networkd-link.c
162@@ -1,8 +1,8 @@ 204@@ -1,8 +1,8 @@
@@ -170,7 +212,7 @@ index f5bb78890a..f13a36b791 100644
170 212
171 #include "alloc-util.h" 213 #include "alloc-util.h"
172diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c 214diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
173index 2b8d0eb2fb..2f79ef25cd 100644 215index 6e443975f171..d1aab0ca5ba2 100644
174--- a/src/network/networkd-network.c 216--- a/src/network/networkd-network.c
175+++ b/src/network/networkd-network.c 217+++ b/src/network/networkd-network.c
176@@ -1,5 +1,6 @@ 218@@ -1,5 +1,6 @@
@@ -180,8 +222,17 @@ index 2b8d0eb2fb..2f79ef25cd 100644
180 #include <net/if.h> 222 #include <net/if.h>
181 #include <netinet/in.h> 223 #include <netinet/in.h>
182 #include <linux/netdevice.h> 224 #include <linux/netdevice.h>
225diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
226index 25b939639775..530e4928835c 100644
227--- a/src/network/test-network-tables.c
228+++ b/src/network/test-network-tables.c
229@@ -1,3 +1,4 @@
230+#include <netinet/if_ether.h>
231 #include "bond.h"
232 #include "dhcp6-internal.h"
233 #include "dhcp6-protocol.h"
183diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c 234diff --git a/src/shared/ethtool-util.c b/src/shared/ethtool-util.c
184index b0961df72e..53fcbbd84b 100644 235index 3119b2b92e3b..927ddd067eef 100644
185--- a/src/shared/ethtool-util.c 236--- a/src/shared/ethtool-util.c
186+++ b/src/shared/ethtool-util.c 237+++ b/src/shared/ethtool-util.c
187@@ -1,5 +1,6 @@ 238@@ -1,5 +1,6 @@
@@ -192,7 +243,7 @@ index b0961df72e..53fcbbd84b 100644
192 #include <sys/ioctl.h> 243 #include <sys/ioctl.h>
193 #include <linux/ethtool.h> 244 #include <linux/ethtool.h>
194diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h 245diff --git a/src/shared/ethtool-util.h b/src/shared/ethtool-util.h
195index 8b32b243f3..262b819976 100644 246index d408bcd90a0b..7a1e399af023 100644
196--- a/src/shared/ethtool-util.h 247--- a/src/shared/ethtool-util.h
197+++ b/src/shared/ethtool-util.h 248+++ b/src/shared/ethtool-util.h
198@@ -2,6 +2,7 @@ 249@@ -2,6 +2,7 @@
@@ -204,7 +255,7 @@ index 8b32b243f3..262b819976 100644
204 255
205 #include "conf-parser.h" 256 #include "conf-parser.h"
206diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c 257diff --git a/src/udev/net/link-config.c b/src/udev/net/link-config.c
207index d44af64d5e..fd052f1591 100644 258index 7b07e2f38fa8..18680a8e5484 100644
208--- a/src/udev/net/link-config.c 259--- a/src/udev/net/link-config.c
209+++ b/src/udev/net/link-config.c 260+++ b/src/udev/net/link-config.c
210@@ -1,5 +1,6 @@ 261@@ -1,5 +1,6 @@
@@ -215,7 +266,7 @@ index d44af64d5e..fd052f1591 100644
215 #include <netinet/ether.h> 266 #include <netinet/ether.h>
216 267
217diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c 268diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
218index ee3ca9fa38..9aa4e82874 100644 269index ee3ca9fa3846..9aa4e828741f 100644
219--- a/src/udev/udev-builtin-net_setup_link.c 270--- a/src/udev/udev-builtin-net_setup_link.c
220+++ b/src/udev/udev-builtin-net_setup_link.c 271+++ b/src/udev/udev-builtin-net_setup_link.c
221@@ -1,5 +1,6 @@ 272@@ -1,5 +1,6 @@