diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-24 11:13:28 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-25 22:36:08 +0100 |
commit | 4cac662d7d705ad6d9d43ac4f724d028b054ac72 (patch) | |
tree | 37a5665b976deb0ff54bc1166dd2cd197339a53c /meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch | |
parent | f003e6015f613b5786ab374853562282cbcd7958 (diff) | |
download | poky-4cac662d7d705ad6d9d43ac4f724d028b054ac72.tar.gz |
systemd: update 247.6 -> 248.3
Drop backports:
48fff0a2af3f62acd446ebec8081b039b72caad8.patch
7c5fd25119a495009ea62f79e5daec34cc464628.patch
0001-analyze-resolve-executable-path-if-it-is-relative.patch
0001-analyze-resolve-executable-path-if-it-is-relative.patch
Drop 0027-proc-dont-trigger-mount-error-with-invalid-options-o.patch
as difficult to rebase; please resend if you feel strongly that
it is needed.
Rebase the big pile of musl patches.
(From OE-Core rev: e8dd5a36bf2f1e645fb2ff15eb3b5e97c04776e6)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch b/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch index e95d2ae078..7444d4375f 100644 --- a/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch +++ b/meta/recipes-core/systemd/systemd/0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 55af446156da863b5b36a1109845858956a4c274 Mon Sep 17 00:00:00 2001 | 1 | From 0f4b60e34a806055c678eb97a7ec7e21291bcf48 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Wed, 4 Jul 2018 15:00:44 +0800 | 3 | Date: Wed, 4 Jul 2018 15:00:44 +0800 |
4 | Subject: [PATCH 14/26] Do not disable buffering when writing to oom_score_adj | 4 | Subject: [PATCH] Do not disable buffering when writing to oom_score_adj |
5 | 5 | ||
6 | On musl, disabling buffering when writing to oom_score_adj will | 6 | On musl, disabling buffering when writing to oom_score_adj will |
7 | cause the following error. | 7 | cause the following error. |
@@ -19,15 +19,16 @@ Upstream-Status: Inappropriate [musl specific] | |||
19 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 19 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
20 | [rebased for systemd 243] | 20 | [rebased for systemd 243] |
21 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | 21 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
22 | |||
22 | --- | 23 | --- |
23 | src/basic/process-util.c | 2 +- | 24 | src/basic/process-util.c | 2 +- |
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | 25 | 1 file changed, 1 insertion(+), 1 deletion(-) |
25 | 26 | ||
26 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c | 27 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
27 | index 4417101569..556dab8ebf 100644 | 28 | index caa9dfe3a3..6101f43db5 100644 |
28 | --- a/src/basic/process-util.c | 29 | --- a/src/basic/process-util.c |
29 | +++ b/src/basic/process-util.c | 30 | +++ b/src/basic/process-util.c |
30 | @@ -1536,7 +1536,7 @@ int set_oom_score_adjust(int value) { | 31 | @@ -1523,7 +1523,7 @@ int set_oom_score_adjust(int value) { |
31 | sprintf(t, "%i", value); | 32 | sprintf(t, "%i", value); |
32 | 33 | ||
33 | return write_string_file("/proc/self/oom_score_adj", t, | 34 | return write_string_file("/proc/self/oom_score_adj", t, |
@@ -36,6 +37,3 @@ index 4417101569..556dab8ebf 100644 | |||
36 | } | 37 | } |
37 | 38 | ||
38 | int pidfd_get_pid(int fd, pid_t *ret) { | 39 | int pidfd_get_pid(int fd, pid_t *ret) { |
39 | -- | ||
40 | 2.27.0 | ||
41 | |||