diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2018-03-12 14:35:45 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-20 09:30:19 +0000 |
commit | 906230a73b3ccfa4afd2a19a6b0aa18cd1d5fa08 (patch) | |
tree | e76d9557b248aa859077ce752db3bdbbab7dabb9 /meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch | |
parent | 388a6cdef0a993d781141f7c375a198f4c4ab808 (diff) | |
download | openembedded-core-contrib-906230a73b3ccfa4afd2a19a6b0aa18cd1d5fa08.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.
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch b/meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch deleted file mode 100644 index df100e587d..0000000000 --- a/meta/recipes-core/systemd/systemd/0001-core-evaluate-presets-after-generators-have-run-6526.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 28dd66ecfce743b1ea9046c7bb501e0fcaeff724 Mon Sep 17 00:00:00 2001 -From: Luca Bruno <luca.bruno@coreos.com> -Date: Sun, 6 Aug 2017 13:24:24 +0000 -Subject: [PATCH] core: evaluate presets after generators have run (#6526) - -This commit moves the first-boot system preset-settings evaluation out -of main and into the manager startup logic itself. Notably, it reverses -the order between generators and presets evaluation, so that any changes -performed by first-boot generators are taken into the account by presets -logic. - -After this change, units created by a generator can be enabled as part -of a preset. - -Upstream-Status: Backport - -Signed-off-by: Catalin Enache <catalin.enache@windriver.com> ---- - src/core/main.c | 12 ++---------- - src/core/manager.c | 8 ++++++++ - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/src/core/main.c b/src/core/main.c -index dfedc3d..11ac9cf 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -1809,18 +1809,10 @@ int main(int argc, char *argv[]) { - if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0) - log_warning_errno(errno, "Failed to make us a subreaper: %m"); - -- if (arg_system) { -+ if (arg_system) -+ /* Bump up RLIMIT_NOFILE for systemd itself */ - (void) bump_rlimit_nofile(&saved_rlimit_nofile); - -- if (empty_etc) { -- r = unit_file_preset_all(UNIT_FILE_SYSTEM, 0, NULL, UNIT_FILE_PRESET_ENABLE_ONLY, NULL, 0); -- if (r < 0) -- log_full_errno(r == -EEXIST ? LOG_NOTICE : LOG_WARNING, r, "Failed to populate /etc with preset unit settings, ignoring: %m"); -- else -- log_info("Populated /etc with preset unit settings."); -- } -- } -- - r = manager_new(arg_system ? UNIT_FILE_SYSTEM : UNIT_FILE_USER, arg_action == ACTION_TEST, &m); - if (r < 0) { - log_emergency_errno(r, "Failed to allocate manager object: %m"); -diff --git a/src/core/manager.c b/src/core/manager.c -index 1aadb70..fb5e2b5 100644 ---- a/src/core/manager.c -+++ b/src/core/manager.c -@@ -1328,6 +1328,14 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) { - if (r < 0) - return r; - -+ if (m->first_boot && m->unit_file_scope == UNIT_FILE_SYSTEM) { -+ q = unit_file_preset_all(UNIT_FILE_SYSTEM, 0, NULL, UNIT_FILE_PRESET_ENABLE_ONLY, NULL, 0); -+ if (q < 0) -+ log_full_errno(q == -EEXIST ? LOG_NOTICE : LOG_WARNING, q, "Failed to populate /etc with preset unit settings, ignoring: %m"); -+ else -+ log_info("Populated /etc with preset unit settings."); -+ } -+ - lookup_paths_reduce(&m->lookup_paths); - manager_build_unit_path_cache(m); - --- -2.10.2 - |