summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-03-12 14:35:45 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-20 09:59:33 +0000
commit40db00818e3b1cce8aa85ee30f3081ae9a5f8e66 (patch)
treedb55cb6251e3e268cf29764fe71aae4e27517b3a /meta/recipes-core/systemd/systemd/0017-Include-netinet-if_ether.h.patch
parent0748f2c4d5c773d1cefa80df97c126194c86b78e (diff)
downloadpoky-40db00818e3b1cce8aa85ee30f3081ae9a5f8e66.tar.gz
systemd: upgrade to 237
Upgrade systemd to 237. Note that this version has dropped autotools support. The following patches are rebased: 0004-Use-getenv-when-secure-versions-are-not-available.patch 0005-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0007-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch 0015-Revert-udev-remove-userspace-firmware-loading-suppor.patch 0018-check-for-uchar.h-in-configure.patch 0019-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch 0001-add-fallback-parse_printf_format-implementation.patch 0002-src-basic-missing.h-check-for-missing-strndupa.patch 0007-check-for-missing-canonicalize_file_name.patch 0008-Do-not-enable-nss-tests.patch 0010-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch 0011-nss-mymachines-Build-conditionally-when-HAVE_MYHOSTN.patch The following backported patches are dropped: 0001-core-evaluate-presets-after-generators-have-run-6526.patch 0001-main-skip-many-initialization-steps-when-running-in-.patch 0001-meson-update-header-file-to-detect-memfd_create.patch 0003-fileio-include-sys-mman.h.patch The following patch is dropped as autotools support is dropped: 0002-configure.ac-Check-if-memfd_create-is-already-define.patch The following patches are newly added to fix problems: 0027-remove-nobody-user-group-checking.patch 0028-add-missing-FTW_-macros-for-musl.patch 0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch 0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch Other changes are mostly autotools/meson related. This new version has dropped ptest support, as there's no easy way to do this in the framework of meson. (From OE-Core rev: 906230a73b3ccfa4afd2a19a6b0aa18cd1d5fa08) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch85
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 @@
1From f2b0173cd9807864db1ef3b102abaa76ef37e506 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 28 Feb 2018 21:19:12 -0800
4Subject: [PATCH 17/31] Include netinet/if_ether.h
5
6Fixes
7/path/to/systemd/recipe-sysroot/usr/include/netinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr'
8 struct ethhdr {
9 ^~~~~~
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14Signed-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
23diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c
24index 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>
35diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c
36index 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>
47diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
48index 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
59diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
60index 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>
71diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c
72index 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--
842.13.0
85