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/0018-avoid-redefinition-of-prctl_mm_map-structure.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/0018-avoid-redefinition-of-prctl_mm_map-structure.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch index 56d361a213..3b60854233 100644 --- a/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch +++ b/meta/recipes-core/systemd/systemd/0018-avoid-redefinition-of-prctl_mm_map-structure.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From bfc3416edeb69082ac9b9c9e844f12d7b45bb006 Mon Sep 17 00:00:00 2001 | 1 | From 45bae28d3da6607d33d54f4b30a500f5249aadde 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: Mon, 25 Feb 2019 15:44:54 +0800 | 3 | Date: Mon, 25 Feb 2019 15:44:54 +0800 |
4 | Subject: [PATCH 18/26] avoid redefinition of prctl_mm_map structure | 4 | Subject: [PATCH] avoid redefinition of prctl_mm_map structure |
5 | 5 | ||
6 | Fix the following compile failure: | 6 | Fix the following compile failure: |
7 | error: redefinition of 'struct prctl_mm_map' | 7 | error: redefinition of 'struct prctl_mm_map' |
@@ -9,6 +9,7 @@ error: redefinition of 'struct prctl_mm_map' | |||
9 | Upstream-Status: Inappropriate [musl specific] | 9 | Upstream-Status: Inappropriate [musl specific] |
10 | 10 | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | src/basic/missing_prctl.h | 2 ++ | 14 | src/basic/missing_prctl.h | 2 ++ |
14 | 1 file changed, 2 insertions(+) | 15 | 1 file changed, 2 insertions(+) |
@@ -27,6 +28,3 @@ index ab851306ba..5547cad875 100644 | |||
27 | 28 | ||
28 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ | 29 | /* 58319057b7847667f0c9585b9de0e8932b0fdb08 (4.3) */ |
29 | #ifndef PR_CAP_AMBIENT | 30 | #ifndef PR_CAP_AMBIENT |
30 | -- | ||
31 | 2.27.0 | ||
32 | |||