diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-02-26 09:20:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-03 15:38:13 +0000 |
commit | 4eb2b3f1503a41474d0c40ada296a9800840267c (patch) | |
tree | a8115d141b07b7d064f434dbaa237676abb517b1 /meta/recipes-core/systemd/systemd/0007-Include-netinet-if_ether.h.patch | |
parent | f1c766fc4e51ada80c022a63176aafd9b40ef07c (diff) | |
download | poky-4eb2b3f1503a41474d0c40ada296a9800840267c.tar.gz |
systemd: upgrade to 241
PATCH REBASED:
==============
0001-binfmt-Don-t-install-dependency-links-at-install-tim.patch
0004-rules-whitelist-hd-devices.patch
0007-rules-watch-metadata-changes-in-ide-devices.patch
0001-Use-getenv-when-secure-versions-are-not-available.patch
0002-don-t-use-glibc-specific-qsort_r.patch
0004-add-fallback-parse_printf_format-implementation.patch
0006-src-basic-missing.h-check-for-missing-strndupa.patch
0007-Include-netinet-if_ether.h.patch
0008-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch
0009-add-missing-FTW_-macros-for-musl.patch
0012-fix-missing-of-__register_atfork-for-non-glibc-build.patch
0013-Use-uintmax_t-for-handling-rlim_t.patch
0014-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch
0021-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch
PATCH DROPPED:
==============
0005-Make-root-s-home-directory-configurable.patch
systemd has its hardcoded assumption about /home and /, and it also respects
$HOME environment var, so this patch is somehow useless. This patch was originally
added but in fact had no real runtime effect except messing up some hardcoded assumptions,
and it was accidently manipulated during systemd upgrade. We have in fact not
used the orignal patch for more than two releases and things were working out
well.
0006-remove-nobody-user-group-checking.patch
The issue has been fixed upstream by the following commit.
"check nobody user/group validity only when not cross compiling"
0008-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch
0009-nss-mymachines-Build-conditionally-when-ENABLE_MYHOS.patch
The issue has been fixed upstream by the following commit.
"meson: allow building resolved and machined without nss modules"
0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch
0001-sd-bus-make-BUS_DEFAULT_TIMEOUT-configurable.patch
Backport
0022-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
Merged
0023-resolvconf-fixes-for-the-compatibility-interface.patch
0001-core-when-deserializing-state-always-use-read_line-L.patch
0001-chown-recursive-let-s-rework-the-recursive-logic-to-.patch
0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
0001-Revert-sysctl.d-request-ECN-on-both-in-and-outgoing-.patch
0001-timesync-changes-type-of-drift_freq-to-int64_t.patch
Backport
0001-sysctl-Don-t-pass-null-directive-argument-to-s.patch
0002-core-Fix-use-after-free-case-in-load_from_path.patch
Merged
0001-meson-rename-Ddebug-to-Ddebug-extra.patch
0024-journald-do-not-store-the-iovec-entry-for-process-co.patch
0025-journald-set-a-limit-on-the-number-of-fields.patch
0026-journal-fix-out-of-bounds-read-CVE-2018-16866.patch
CVE-2019-6454.patch
sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch
0005-basic-user-util-properly-protect-use-of-gshadow.patch
0022-Use-if-instead-of-ifdef-for-ENABLE_GSHADOW.patch
Backport
0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch
No build failure for qemux86/qemuppc + musl
PATCH ADDED:
============
0020-missing_type.h-add-__compar_d_fn_t-definition.patch
0021-avoid-redefinition-of-prctl_mm_map-structure.patch
0022-include-sys-wait.h-to-avoid-compile-failure.patch
0023-socket-util.h-include-string.h.patch
0024-test-json.c-define-M_PIl.patch
0001-do-not-disable-buffer-in-writing-files.patch
PATCH OTHERS:
=============
0003-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch
0011-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch
are combined into one patch:
0003-missing_type.h-add-__compare_fn_t-and-comparison_fn_.patch
Add two more PACKAGECONFIG, nss-mymachines and nss-resolve which are introduced
by the following commit.
meson: allow building resolved and machined without nss modules
(From OE-Core rev: 816e08c18dbcf6e84dedc7a4bd96ddfbf2f86ebc)
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/0007-Include-netinet-if_ether.h.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0007-Include-netinet-if_ether.h.patch | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/meta/recipes-core/systemd/systemd/0007-Include-netinet-if_ether.h.patch b/meta/recipes-core/systemd/systemd/0007-Include-netinet-if_ether.h.patch deleted file mode 100644 index 2df8cf95fd..0000000000 --- a/meta/recipes-core/systemd/systemd/0007-Include-netinet-if_ether.h.patch +++ /dev/null | |||
@@ -1,96 +0,0 @@ | |||
1 | From aab90d0dfa934d33879eaec1a878e93b201d33f1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Fri, 29 Jun 2018 16:44:43 +0800 | ||
4 | Subject: [PATCH 07/19] 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: Inappropriate [musl specific] | ||
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/net/ethtool-util.h | 1 + | ||
21 | src/udev/udev-builtin-net_setup_link.c | 1 + | ||
22 | 6 files changed, 6 insertions(+) | ||
23 | |||
24 | diff --git a/src/libsystemd/sd-netlink/netlink-types.c b/src/libsystemd/sd-netlink/netlink-types.c | ||
25 | index c93fe9cb4..2013d06e1 100644 | ||
26 | --- a/src/libsystemd/sd-netlink/netlink-types.c | ||
27 | +++ b/src/libsystemd/sd-netlink/netlink-types.c | ||
28 | @@ -3,6 +3,7 @@ | ||
29 | #include <netinet/in.h> | ||
30 | #include <stdint.h> | ||
31 | #include <sys/socket.h> | ||
32 | +#include <netinet/if_ether.h> | ||
33 | #include <linux/netlink.h> | ||
34 | #include <linux/rtnetlink.h> | ||
35 | #include <linux/genetlink.h> | ||
36 | diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c | ||
37 | index 21fb7ab06..0afe5170c 100644 | ||
38 | --- a/src/network/netdev/tuntap.c | ||
39 | +++ b/src/network/netdev/tuntap.c | ||
40 | @@ -2,6 +2,7 @@ | ||
41 | |||
42 | #include <errno.h> | ||
43 | #include <fcntl.h> | ||
44 | +#include <netinet/if_ether.h> | ||
45 | #include <linux/if_tun.h> | ||
46 | #include <net/if.h> | ||
47 | #include <netinet/if_ether.h> | ||
48 | diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c | ||
49 | index 8e8a618e2..52d523a67 100644 | ||
50 | --- a/src/network/networkd-brvlan.c | ||
51 | +++ b/src/network/networkd-brvlan.c | ||
52 | @@ -4,6 +4,7 @@ | ||
53 | ***/ | ||
54 | |||
55 | #include <netinet/in.h> | ||
56 | +#include <netinet/if_ether.h> | ||
57 | #include <linux/if_bridge.h> | ||
58 | #include <stdbool.h> | ||
59 | |||
60 | diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c | ||
61 | index 4bb4216ac..5f7383483 100644 | ||
62 | --- a/src/udev/net/ethtool-util.c | ||
63 | +++ b/src/udev/net/ethtool-util.c | ||
64 | @@ -1,5 +1,6 @@ | ||
65 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
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/net/ethtool-util.h b/src/udev/net/ethtool-util.h | ||
72 | index 064bf4d2b..ee0d4fb2a 100644 | ||
73 | --- a/src/udev/net/ethtool-util.h | ||
74 | +++ b/src/udev/net/ethtool-util.h | ||
75 | @@ -3,6 +3,7 @@ | ||
76 | |||
77 | |||
78 | #include <macro.h> | ||
79 | +#include <netinet/if_ether.h> | ||
80 | #include <linux/ethtool.h> | ||
81 | |||
82 | #include "missing.h" | ||
83 | diff --git a/src/udev/udev-builtin-net_setup_link.c b/src/udev/udev-builtin-net_setup_link.c | ||
84 | index 8bed6399a..a3a96959b 100644 | ||
85 | --- a/src/udev/udev-builtin-net_setup_link.c | ||
86 | +++ b/src/udev/udev-builtin-net_setup_link.c | ||
87 | @@ -1,5 +1,6 @@ | ||
88 | /* SPDX-License-Identifier: LGPL-2.1+ */ | ||
89 | |||
90 | +#include <netinet/if_ether.h> | ||
91 | #include "alloc-util.h" | ||
92 | #include "link-config.h" | ||
93 | #include "log.h" | ||
94 | -- | ||
95 | 2.11.0 | ||
96 | |||