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/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.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/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index c15b6e7d82..5f2178734d 100644 --- a/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 03e89da266edf70121a19ffc32a78cc3b97585ef Mon Sep 17 00:00:00 2001 | 1 | From 06915b70735caa66987af758ebdc4207757ae758 Mon Sep 17 00:00:00 2001 |
2 | From: Andre McCurdy <armccurdy@gmail.com> | 2 | From: Andre McCurdy <armccurdy@gmail.com> |
3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 | 3 | Date: Tue, 10 Oct 2017 14:33:30 -0700 |
4 | Subject: [PATCH 12/26] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() | 4 | Subject: [PATCH] don't pass AT_SYMLINK_NOFOLLOW flag to faccessat() |
5 | 5 | ||
6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right | 6 | Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right |
7 | thing to do and it's not portable (not supported by musl). See: | 7 | thing to do and it's not portable (not supported by musl). See: |
@@ -25,20 +25,22 @@ just historical and not actually necessary or desired behaviour? | |||
25 | Upstream-Status: Inappropriate [musl specific] | 25 | Upstream-Status: Inappropriate [musl specific] |
26 | 26 | ||
27 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | 27 | Signed-off-by: Andre McCurdy <armccurdy@gmail.com> |
28 | |||
28 | --- | 29 | --- |
29 | src/basic/fs-util.h | 22 +++++++++++++++++++++- | 30 | src/basic/fs-util.h | 23 +++++++++++++++++++++-- |
30 | src/shared/base-filesystem.c | 6 +++--- | 31 | src/shared/base-filesystem.c | 6 +++--- |
31 | 2 files changed, 24 insertions(+), 4 deletions(-) | 32 | 2 files changed, 24 insertions(+), 5 deletions(-) |
32 | 33 | ||
33 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h | 34 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h |
34 | index 5dc8853eac..0491b3dae2 100644 | 35 | index 027037f7a7..16eb379caf 100644 |
35 | --- a/src/basic/fs-util.h | 36 | --- a/src/basic/fs-util.h |
36 | +++ b/src/basic/fs-util.h | 37 | +++ b/src/basic/fs-util.h |
37 | @@ -43,7 +43,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); | 38 | @@ -44,8 +44,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); |
38 | int fd_warn_permissions(const char *path, int fd); | 39 | int fd_warn_permissions(const char *path, int fd); |
39 | int stat_warn_permissions(const char *path, const struct stat *st); | 40 | int stat_warn_permissions(const char *path, const struct stat *st); |
40 | 41 | ||
41 | -#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) | 42 | -#define laccess(path, mode) \ |
43 | - (faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) < 0 ? -errno : 0) | ||
42 | +/* | 44 | +/* |
43 | + Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to | 45 | + Avoid using AT_SYMLINK_NOFOLLOW flag. It doesn't seem like the right thing to |
44 | + do and it's not portable (not supported by musl). See: | 46 | + do and it's not portable (not supported by musl). See: |
@@ -94,6 +96,3 @@ index 1d05409086..1ed06c31ab 100644 | |||
94 | continue; | 96 | continue; |
95 | } | 97 | } |
96 | 98 | ||
97 | -- | ||
98 | 2.27.0 | ||
99 | |||