diff options
| author | Khem Raj <raj.khem@gmail.com> | 2023-05-23 23:40:02 -0700 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-06-21 06:50:50 -1000 |
| commit | d878b48ed869ebda4f08b15f0d7132db63707292 (patch) | |
| tree | 69b7b8da5ffa9296a55c4c702a237d84b98d50ba | |
| parent | d7781c43dbec05f2734212d68a29eb0cc59db454 (diff) | |
| download | poky-d878b48ed869ebda4f08b15f0d7132db63707292.tar.gz | |
systemd: Drop a backport
This patch should have been dropped when upgrading to 253
since its already available upstream since then
(From OE-Core rev: a0f5dc78f030a3c4efbc864c385b6592a22ef1ec)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5b677b766280b39e8bf507d5aec4f08e49fd72a9)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_253.1.bb | 1 |
2 files changed, 0 insertions, 30 deletions
diff --git a/meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch b/meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch deleted file mode 100644 index 479b9a1ca1..0000000000 --- a/meta/recipes-core/systemd/systemd/0007-Add-sys-stat.h-for-S_IFDIR.patch +++ /dev/null | |||
| @@ -1,29 +0,0 @@ | |||
| 1 | From 1480ef4ea9f71befbc22272c219b62ee5cd71d43 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Khem Raj <raj.khem@gmail.com> | ||
| 3 | Date: Fri, 21 Jan 2022 15:17:37 -0800 | ||
| 4 | Subject: [PATCH] Add sys/stat.h for S_IFDIR | ||
| 5 | |||
| 6 | ../git/src/shared/mkdir-label.c:13:61: error: use of undeclared identifier 'S_IFDIR' | ||
| 7 | r = mac_selinux_create_file_prepare_at(dirfd, path, S_IFDIR); | ||
| 8 | |||
| 9 | Upstream-Status: Backport [29b7114c5d9624002aa7c17748d960cd1e45362d] | ||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 11 | --- | ||
| 12 | src/shared/mkdir-label.c | 1 + | ||
| 13 | 1 file changed, 1 insertion(+) | ||
| 14 | |||
| 15 | diff --git a/src/shared/mkdir-label.c b/src/shared/mkdir-label.c | ||
| 16 | index e3afc2b666..f1df778966 100644 | ||
| 17 | --- a/src/shared/mkdir-label.c | ||
| 18 | +++ b/src/shared/mkdir-label.c | ||
| 19 | @@ -7,6 +7,7 @@ | ||
| 20 | #include "selinux-util.h" | ||
| 21 | #include "smack-util.h" | ||
| 22 | #include "user-util.h" | ||
| 23 | +#include <sys/stat.h> | ||
| 24 | |||
| 25 | int mkdirat_label(int dirfd, const char *path, mode_t mode) { | ||
| 26 | int r; | ||
| 27 | -- | ||
| 28 | 2.39.2 | ||
| 29 | |||
diff --git a/meta/recipes-core/systemd/systemd_253.1.bb b/meta/recipes-core/systemd/systemd_253.1.bb index 9c2b96d3c1..f306765168 100644 --- a/meta/recipes-core/systemd/systemd_253.1.bb +++ b/meta/recipes-core/systemd/systemd_253.1.bb | |||
| @@ -47,7 +47,6 @@ SRC_URI_MUSL = "\ | |||
| 47 | file://0023-Handle-missing-gshadow.patch \ | 47 | file://0023-Handle-missing-gshadow.patch \ |
| 48 | file://0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ | 48 | file://0024-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch \ |
| 49 | file://0005-pass-correct-parameters-to-getdents64.patch \ | 49 | file://0005-pass-correct-parameters-to-getdents64.patch \ |
| 50 | file://0007-Add-sys-stat.h-for-S_IFDIR.patch \ | ||
| 51 | file://0001-Adjust-for-musl-headers.patch \ | 50 | file://0001-Adjust-for-musl-headers.patch \ |
| 52 | file://0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ | 51 | file://0006-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ |
| 53 | file://0003-errno-util-Make-STRERROR-portable-for-musl.patch \ | 52 | file://0003-errno-util-Make-STRERROR-portable-for-musl.patch \ |
