diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch new file mode 100644 index 0000000000..a09cfddaa8 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch | |||
@@ -0,0 +1,85 @@ | |||
1 | From f2b0173cd9807864db1ef3b102abaa76ef37e506 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Wed, 28 Feb 2018 21:19:12 -0800 | ||
4 | Subject: [PATCH 17/31] Include netinet/if_ether.h | ||
5 | |||
6 | Fixes | ||
7 | /path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr' | ||
8 | struct ethhdr { | ||
9 | ^~~~~~ | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
15 | --- | ||
16 | src/libsystemd/sd-netlink/netlink-types.c | 1 + | ||
17 | src/network/netdev/tuntap.c | 1 + | ||
18 | src/network/networkd-brvlan.c | 1 + | ||
19 | src/udev/net/ethtool-util.c | 1 + | ||
20 | src/udev/udev-builtin-net_setup_link.c | 1 + | ||
21 | 5 files changed, 5 insertions(+) | ||
22 | |||
23 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c | ||
24 | index 0ee7d6f0d..ef75893a6 100644 | ||
25 | --- a/src/libsystemd/sd-netlink/netlink-types.c | ||
26 | +++ b/src/libsystemd/sd-netlink/netlink-types.c | ||
27 | @@ -21,6 +21,7 @@ | ||
28 | #include <netinet/in.h> | ||
29 | #include <stdint.h> | ||
30 | #include <sys/socket.h> | ||
31 | +#include <netinet/if_ether.h> | ||
32 | #include <linux/netlink.h> | ||
33 | #include <linux/rtnetlink.h> | ||
34 | #include <linux/genetlink.h> | ||
35 | diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c | ||
36 | index 4fc9b610a..628c61c57 100644 | ||
37 | --- a/src/network/netdev/tuntap.c | ||
38 | +++ b/src/network/netdev/tuntap.c | ||
39 | @@ -20,6 +20,7 @@ | ||
40 | |||
41 | #include <errno.h> | ||
42 | #include <fcntl.h> | ||
43 | +#include <netinet/if_ether.h> | ||
44 | #include <linux/if_tun.h> | ||
45 | #include <net/if.h> | ||
46 | #include <netinet/if_ether.h> | ||
47 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c | ||
48 | index 99dd41629..90407c9d8 100644 | ||
49 | --- a/src/network/networkd-brvlan.c | ||
50 | +++ b/src/network/networkd-brvlan.c | ||
51 | @@ -19,6 +19,7 @@ | ||
52 | ***/ | ||
53 | |||
54 | #include <netinet/in.h> | ||
55 | +#include <netinet/if_ether.h> | ||
56 | #include <linux/if_bridge.h> | ||
57 | #include <stdbool.h> | ||
58 | |||
59 | diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c | ||
60 | index 9bdaef8d9..948f89cf8 100644 | ||
61 | --- a/src/udev/net/ethtool-util.c | ||
62 | +++ b/src/udev/net/ethtool-util.c | ||
63 | @@ -18,6 +18,7 @@ | ||
64 | along with systemd; If not, see <http://www.gnu.org/licenses/>. | ||
65 | ***/ | ||
66 | |||
67 | +#include <netinet/if_ether.h> | ||
68 | #include <net/if.h> | ||
69 | #include <sys/ioctl.h> | ||
70 | #include <linux/ethtool.h> | ||
71 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c | ||
72 | index 40158e0af..b24b3fce8 100644 | ||
73 | --- a/src/udev/udev-builtin-net_setup_link.c | ||
74 | +++ b/src/udev/udev-builtin-net_setup_link.c | ||
75 | @@ -18,6 +18,7 @@ | ||
76 | along with systemd; If not, see <http://www.gnu.org/licenses/>. | ||
77 | ***/ | ||
78 | |||
79 | +#include <netinet/if_ether.h> | ||
80 | #include "alloc-util.h" | ||
81 | #include "link-config.h" | ||
82 | #include "log.h" | ||
83 | -- | ||
84 | 2.13.0 | ||
85 | |||