summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd/systemd/0006-src-basic-missing.h-check-for-missing-strndupa.patch
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2018-07-17 10:05:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-07-18 10:18:42 +0100
commitada8a5d9175b141b4fe532f542f5c1f7ffa26d88 (patch)
tree64af2142c781c13ee7669004b615d41cfb787f92 /meta/recipes-core/systemd/systemd/0006-src-basic-missing.h-check-for-missing-strndupa.patch
parent219eed186d32b01a7132233c5110c08055ed6e27 (diff)
downloadpoky-ada8a5d9175b141b4fe532f542f5c1f7ffa26d88.tar.gz
systemd: upgrade to 239
Upgrade systemd to 239. 1. Patch Changes * Rebased Patches 0002-binfmt-Don-t-install-dependency-links-at-install-tim.patch 0003-use-lnr-wrapper-instead-of-looking-for-relative-opti.patch 0006-Make-root-s-home-directory-configurable.patch 0027-remove-nobody-user-group-checking.patch 0011-socket-util-don-t-fail-if-libc-doesn-t-support-IDN.patch 0013-add-fallback-parse_printf_format-implementation.patch 0014-src-basic-missing.h-check-for-missing-strndupa.patch 0015-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch 0016-src-basic-missing.h-check-for-missing-__compar_fn_t-.patch 0017-Include-netinet-if_ether.h.patch 0019-Do-not-enable-nss-tests-if-nss-systemd-is-not-enable.patch 0022-don-t-use-glibc-specific-qsort_r.patch 0024-comparison_fn_t-is-glibc-specific-use-raw-signature-.patch 0026-Use-uintmax_t-for-handling-rlim_t.patch 0030-fix-missing-of-__register_atfork-for-non-glibc-build.patch 0031-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch 0001-core-device.c-Change-the-default-device-timeout-to-2.patch 0001-Remove-fstack-protector-flags-to-workaround-musl-bui.patch * Dropped Patches and Reasons 0001-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch This patch is dropped because the problem has been fixed by binutils upstream. And this workaround could be dropped. https://sourceware.org/bugzilla/show_bug.cgi?id=18548 0007-Revert-rules-remove-firmware-loading-rules.patch 0008-Revert-udev-remove-userspace-firmware-loading-suppor.patch These two patches are dropped because they are for kernel < 3.7. But the current minimal requirement of kernel to build systemd is as below. REQUIREMENTS: Linux kernel >= 3.13 Linux kernel >= 4.2 for unified cgroup hierarchy support So these two patches no long make any sense. Also remove non-exist firmware-path option 0009-remove-duplicate-include-uchar.h.patch 0010-check-for-uchar.h-in-meson.build.patch These two patches are dropped because musl has implemented uchar.h. See commit below from musl repo. """ ab9672ae73248f51e30f4553c4b8878525e46383 implement uchar.h (C11 UTF-16/32 conversion) interfaces """ 0018-check-for-missing-canonicalize_file_name.patch The above patch is dropped because current systemd does not need canonicalize_file_name. 0025-Define-_PATH_WTMPX-and-_PATH_UTMPX-if-not-defined.patch The above patch is dropped because utmp makes no sense in musl. Check code below from musl. include/utmp.h:#define _PATH_UTMP "/dev/null/utmp" And utmp PACKAGECONFIG has been explicitly disabled for musl. So we don't need this patch. 0032-memfd.patch 0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch libmount.patch 0034-Fix-format-truncation-compile-failure-by-typecasting.patch The above patches are dropped because they are backported patches. And current systemd has contained these patches. 0036-time-util-fix-build-with-gcc8-Werror-format-truncati.patch The above patch is dropped because it has been merged and is now in new version. * Newly Added Patch 0005-include-gshadow-only-if-ENABLE_GSHADOW-is-1.patch This patch is added to fix build for musl. 0019-Do-not-disable-buffering-when-writing-to-oom_score_a.patch This patch is added to fix the following error which caused system unable to boot up. systemd-udevd.service: Failed to adjust OOM setting: Invalid argument dbus.service: Failed to adjust OOM setting: Invalid argument 0020-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch This patch is added to fix segment fault error on musl systems. 0001-login-use-parse_uid-when-unmounting-user-runtime-dir.patch This patch is backported to solve a race condition between user-runtime-dir@xxx.service stop and user deletion. 2. PACKAGECONFIG and Dependency Changes * Add a new PACKAGECONFIG item 'gshadow'. Enable it by default for glibc but disable it by default for musl. This is because musl does not provide gshadow.h. * Add a new PACKAGECONFIG item 'portabled'. Default to disable it because it's still experimental, according to the announcement letter. """ Currently, the support is still experimental, but this is expected to change soon. Reflecting this experimental state, the "portablectl" binary is not installed into /usr/bin yet. """ * Change 'kmod' from a hard dependency to a PACKAGECONFIG item. Default to enable it. * Change 'acl' from a hard dependency to a PACKAGECONFIG item. Default to enable it. * Remove 'readline' from DEPENDS. systemd does not need it. * Remove 'libcgroup' from DEPENDS. The dependency on libcgroup has been removed from systemd a long time ago. We now remove this unnecessary dependency from DEPENDS. 3. update-alternatives changes The utilities like shutdown, poweroff, etc. are now created as symlinks at do_install. So there's no need to use update-alternatives mechanism anymore to create the symlinks now. In addtion, I don't think we now support multiple init systems at one running system, so there's really no need to use update-alternatives mechanism here. Also update the FILES_${PN} to include these files to avoid QA issue. (From OE-Core rev: 597f4645faf61486eb1d2ab73f3d974460ab9466) 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/0006-src-basic-missing.h-check-for-missing-strndupa.patch')
-rw-r--r--meta/recipes-core/systemd/systemd/0006-src-basic-missing.h-check-for-missing-strndupa.patch118
1 files changed, 118 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0006-src-basic-missing.h-check-for-missing-strndupa.patch b/meta/recipes-core/systemd/systemd/0006-src-basic-missing.h-check-for-missing-strndupa.patch
new file mode 100644
index 0000000000..107a794398
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/0006-src-basic-missing.h-check-for-missing-strndupa.patch
@@ -0,0 +1,118 @@
1From 03fd19fc87573276e0d359260c8fe591f5f0216a Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Fri, 29 Jun 2018 16:34:50 +0800
4Subject: [PATCH 06/19] src/basic/missing.h: check for missing strndupa
5
6include missing.h for definition of strndupa
7
8Upstream-Status: Inappropriate [musl specific]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
12---
13 meson.build | 1 +
14 src/basic/missing.h | 11 +++++++++++
15 src/basic/mkdir.c | 1 +
16 src/basic/pager.c | 1 +
17 src/basic/parse-util.c | 1 +
18 src/basic/procfs-util.c | 1 +
19 src/shared/uid-range.c | 1 +
20 7 files changed, 17 insertions(+)
21
22diff --git a/meson.build b/meson.build
23index 8c16bc979..a734a295c 100644
24--- a/meson.build
25+++ b/meson.build
26@@ -503,6 +503,7 @@ foreach ident : [
27 #include <unistd.h>'''],
28 ['explicit_bzero' , '''#include <string.h>'''],
29 ['reallocarray', '''#include <malloc.h>'''],
30+ ['strndupa' , '''#include <string.h>'''],
31 ]
32
33 have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
34diff --git a/src/basic/missing.h b/src/basic/missing.h
35index 0e33abb9f..02397f1b6 100644
36--- a/src/basic/missing.h
37+++ b/src/basic/missing.h
38@@ -1184,6 +1184,17 @@ struct input_mask {
39 typedef int32_t key_serial_t;
40 #endif
41
42+#if ! HAVE_STRNDUPA
43+#define strndupa(s, n) \
44+ ({ \
45+ const char *__old = (s); \
46+ size_t __len = strnlen(__old, (n)); \
47+ char *__new = (char *)alloca(__len + 1); \
48+ __new[__len] = '\0'; \
49+ (char *)memcpy(__new, __old, __len); \
50+ })
51+#endif
52+
53 #ifndef KEYCTL_JOIN_SESSION_KEYRING
54 #define KEYCTL_JOIN_SESSION_KEYRING 1
55 #endif
56diff --git a/src/basic/mkdir.c b/src/basic/mkdir.c
57index 6ab1b4422..77c3e0863 100644
58--- a/src/basic/mkdir.c
59+++ b/src/basic/mkdir.c
60@@ -13,6 +13,7 @@
61 #include "stat-util.h"
62 #include "stdio-util.h"
63 #include "user-util.h"
64+#include "missing.h"
65
66 int mkdir_safe_internal(const char *path, mode_t mode, uid_t uid, gid_t gid, MkdirFlags flags, mkdir_func_t _mkdir) {
67 struct stat st;
68diff --git a/src/basic/pager.c b/src/basic/pager.c
69index f24126111..8223bff02 100644
70--- a/src/basic/pager.c
71+++ b/src/basic/pager.c
72@@ -21,6 +21,7 @@
73 #include "string-util.h"
74 #include "strv.h"
75 #include "terminal-util.h"
76+#include "missing.h"
77
78 static pid_t pager_pid = 0;
79
80diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
81index 6becf8587..52576f536 100644
82--- a/src/basic/parse-util.c
83+++ b/src/basic/parse-util.c
84@@ -17,6 +17,7 @@
85 #include "parse-util.h"
86 #include "process-util.h"
87 #include "string-util.h"
88+#include "missing.h"
89
90 int parse_boolean(const char *v) {
91 assert(v);
92diff --git a/src/basic/procfs-util.c b/src/basic/procfs-util.c
93index a159e344b..ebc427d6b 100644
94--- a/src/basic/procfs-util.c
95+++ b/src/basic/procfs-util.c
96@@ -11,6 +11,7 @@
97 #include "procfs-util.h"
98 #include "stdio-util.h"
99 #include "string-util.h"
100+#include "missing.h"
101
102 int procfs_tasks_get_limit(uint64_t *ret) {
103 _cleanup_free_ char *value = NULL;
104diff --git a/src/shared/uid-range.c b/src/shared/uid-range.c
105index 434ce6ff4..37093ab7b 100644
106--- a/src/shared/uid-range.c
107+++ b/src/shared/uid-range.c
108@@ -8,6 +8,7 @@
109 #include "macro.h"
110 #include "uid-range.h"
111 #include "user-util.h"
112+#include "missing.h"
113
114 static bool uid_range_intersect(UidRange *range, uid_t start, uid_t nr) {
115 assert(range);
116--
1172.11.0
118