diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-12-28 09:55:41 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-28 23:59:55 +0000 |
commit | 77d8b2cc80f2cd12b3267367dc453ef0d53c2af2 (patch) | |
tree | 77466925ebdbdf655f0e5bb8b16dff497cfaafdc /meta/recipes-core/systemd/systemd/0012-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | |
parent | ff81714af34de533104df1686d28bc9735c02c58 (diff) | |
download | poky-77d8b2cc80f2cd12b3267367dc453ef0d53c2af2.tar.gz |
systemd: Fix 252 release build on musl
(From OE-Core rev: 38256b5d8caa54024df9df908cc7fa49ca5fac39)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 14 |
1 files changed, 5 insertions, 9 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 e1a2512ec3..6367adce07 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 | |||
@@ -31,11 +31,9 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
31 | src/shared/base-filesystem.c | 6 +++--- | 31 | src/shared/base-filesystem.c | 6 +++--- |
32 | 2 files changed, 23 insertions(+), 4 deletions(-) | 32 | 2 files changed, 23 insertions(+), 4 deletions(-) |
33 | 33 | ||
34 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h | ||
35 | index 0bbb3f6298..3dc494dbfb 100644 | ||
36 | --- a/src/basic/fs-util.h | 34 | --- a/src/basic/fs-util.h |
37 | +++ b/src/basic/fs-util.h | 35 | +++ b/src/basic/fs-util.h |
38 | @@ -46,8 +46,27 @@ int futimens_opath(int fd, const struct timespec ts[2]); | 36 | @@ -47,8 +47,27 @@ int futimens_opath(int fd, const struct |
39 | int fd_warn_permissions(const char *path, int fd); | 37 | int fd_warn_permissions(const char *path, int fd); |
40 | int stat_warn_permissions(const char *path, const struct stat *st); | 38 | int stat_warn_permissions(const char *path, const struct stat *st); |
41 | 39 | ||
@@ -63,12 +61,10 @@ index 0bbb3f6298..3dc494dbfb 100644 | |||
63 | + RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), 0)) | 61 | + RET_NERRNO(faccessat(AT_FDCWD, (path), (mode), 0)) |
64 | 62 | ||
65 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); | 63 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); |
66 | int touch(const char *path); | 64 | |
67 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c | ||
68 | index 6dacc1d20a..909a6818f6 100644 | ||
69 | --- a/src/shared/base-filesystem.c | 65 | --- a/src/shared/base-filesystem.c |
70 | +++ b/src/shared/base-filesystem.c | 66 | +++ b/src/shared/base-filesystem.c |
71 | @@ -131,7 +131,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 67 | @@ -131,7 +131,7 @@ int base_filesystem_create(const char *r |
72 | return log_error_errno(errno, "Failed to open root file system: %m"); | 68 | return log_error_errno(errno, "Failed to open root file system: %m"); |
73 | 69 | ||
74 | for (size_t i = 0; i < ELEMENTSOF(table); i++) { | 70 | for (size_t i = 0; i < ELEMENTSOF(table); i++) { |
@@ -77,7 +73,7 @@ index 6dacc1d20a..909a6818f6 100644 | |||
77 | continue; | 73 | continue; |
78 | 74 | ||
79 | if (table[i].target) { | 75 | if (table[i].target) { |
80 | @@ -139,7 +139,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 76 | @@ -139,7 +139,7 @@ int base_filesystem_create(const char *r |
81 | 77 | ||
82 | /* check if one of the targets exists */ | 78 | /* check if one of the targets exists */ |
83 | NULSTR_FOREACH(s, table[i].target) { | 79 | NULSTR_FOREACH(s, table[i].target) { |
@@ -86,7 +82,7 @@ index 6dacc1d20a..909a6818f6 100644 | |||
86 | continue; | 82 | continue; |
87 | 83 | ||
88 | /* check if a specific file exists at the target path */ | 84 | /* check if a specific file exists at the target path */ |
89 | @@ -150,7 +150,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 85 | @@ -150,7 +150,7 @@ int base_filesystem_create(const char *r |
90 | if (!p) | 86 | if (!p) |
91 | return log_oom(); | 87 | return log_oom(); |
92 | 88 | ||