summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-10-26 22:10:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-08 22:24:04 +0000
commitaf34166d38382382df5b6400fa30ac80b209a866 (patch)
treebb3dd21351f68558c5364c1a37f8556e53785e1f /meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
parent997764c34a2232f45f0db52346ea7dc710b8d045 (diff)
downloadpoky-af34166d38382382df5b6400fa30ac80b209a866.tar.gz
systemd: Fix build on musl
Add needed patches for portability across glibc/musl enable systemd on musl too Disable utmp,ldconfig,nss,resolved,localed for musl which is not supported on musl (From OE-Core rev: acdee728f0f6358dda709304ec307d737124aee6) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.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.patch86
1 files changed, 86 insertions, 0 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
new file mode 100644
index 0000000000..55887ee823
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0006-Include-netinet-if_ether.h.patch
@@ -0,0 +1,86 @@
1From 21080b6a40d0a4ddd2db8f0fa37686f6fa885d1c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 23 Oct 2017 11:38:33 -0700
4Subject: [PATCH 06/12] Include netinet/if_ether.h
5
6Fixes
7/mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/systemd/1_234-r0/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr'
8 struct ethhdr {
9 ^~~~~~
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13Upstream-Status: Pending
14
15 src/libsystemd/sd-netlink/netlink-types.c | 1 +
16 src/network/netdev/tuntap.c | 1 +
17 src/network/networkd-brvlan.c | 1 +
18 src/udev/net/ethtool-util.c | 2 +-
19 src/udev/udev-builtin-net_setup_link.c | 2 +-
20 5 files changed, 5 insertions(+), 2 deletions(-)
21
22diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
23index 923f7dd10..b95b1e4b2 100644
24--- a/src/libsystemd/sd-netlink/netlink-types.c
25+++ b/src/libsystemd/sd-netlink/netlink-types.c
26@@ -19,6 +19,7 @@
27
28 #include <stdint.h>
29 #include <sys/socket.h>
30+#include <netinet/if_ether.h>
31 #include <linux/netlink.h>
32 #include <linux/rtnetlink.h>
33 #include <linux/can/netlink.h>
34diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c
35index 3d6280884..40e58c38f 100644
36--- a/src/network/netdev/tuntap.c
37+++ b/src/network/netdev/tuntap.c
38@@ -18,6 +18,7 @@
39 ***/
40
41 #include <fcntl.h>
42+#include <netinet/if_ether.h>
43 #include <linux/if_tun.h>
44 #include <net/if.h>
45 #include <netinet/if_ether.h>
46diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
47index fa5d3ee7f..e0828962a 100644
48--- a/src/network/networkd-brvlan.c
49+++ b/src/network/networkd-brvlan.c
50@@ -18,6 +18,7 @@
51 ***/
52
53 #include <netinet/in.h>
54+#include <netinet/if_ether.h>
55 #include <linux/if_bridge.h>
56 #include <stdbool.h>
57
58diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
59index 201fc2343..5f7cc2a0a 100644
60--- a/src/udev/net/ethtool-util.c
61+++ b/src/udev/net/ethtool-util.c
62@@ -16,7 +16,7 @@
63 You should have received a copy of the GNU Lesser General Public License
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>
71diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
72index 8e4777513..d01fff2a4 100644
73--- a/src/udev/udev-builtin-net_setup_link.c
74+++ b/src/udev/udev-builtin-net_setup_link.c
75@@ -16,7 +16,7 @@
76 You should have received a copy of the GNU Lesser General Public License
77 along with systemd; If not, see <http://www.gnu.org/licenses/>.
78 ***/
79-
80+#include <netinet/if_ether.h>
81 #include "alloc-util.h"
82 #include "link-config.h"
83 #include "log.h"
84--
852.14.2
86