diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-16 16:02:59 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-17 11:01:17 +0000 |
commit | f45877b2082d6d7e94dc10a70d470ba82e342cee (patch) | |
tree | 54d7a68c3e87911bed548fb8cd8e93e612644a4c /meta/recipes-core | |
parent | b6018a1625c22393c1f94e9d23d84f7842b95f24 (diff) | |
download | poky-f45877b2082d6d7e94dc10a70d470ba82e342cee.tar.gz |
systemd: Drop unneeded musl patches
These two header fixes are not needed with the current source as the
headers are there through other header files. Drop the patches.
(From OE-Core rev: ece3efe43b6b9de5426c23f29db15dd709bcd749)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
3 files changed, 0 insertions, 66 deletions
diff --git a/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch deleted file mode 100644 index ea4a024b82..0000000000 --- a/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 359e7a38824a906b0a24f5775f41a2ae3358bf06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Scott Murray <scott.murray@konsulko.com> | ||
3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 | ||
4 | Subject: [PATCH 23/26] Include sys/wait.h | ||
5 | |||
6 | Fixes: | ||
7 | src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? | ||
8 | 158 | r = sd_event_add_child(w->manager->event, &w->child_event_source, w->child, WEXITED, on_brightness_writer_exit, w); | ||
9 | | ^~~~~~~ | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
14 | --- | ||
15 | src/login/logind-brightness.c | 1 + | ||
16 | 1 file changed, 1 insertion(+) | ||
17 | |||
18 | diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c | ||
19 | index a6a1603396..54848ce209 100644 | ||
20 | --- a/src/login/logind-brightness.c | ||
21 | +++ b/src/login/logind-brightness.c | ||
22 | @@ -1,5 +1,6 @@ | ||
23 | /* SPDX-License-Identifier: LGPL-2.1-or-later */ | ||
24 | |||
25 | +#include <sys/wait.h> | ||
26 | #include "bus-util.h" | ||
27 | #include "device-util.h" | ||
28 | #include "hash-funcs.h" | ||
29 | -- | ||
30 | 2.27.0 | ||
31 | |||
diff --git a/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch b/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch deleted file mode 100644 index 2820d7b322..0000000000 --- a/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 0592da08e16a17ceef0949ec9901397d8ec5af92 Mon Sep 17 00:00:00 2001 | ||
2 | From: Scott Murray <scott.murray@konsulko.com> | ||
3 | Date: Fri, 13 Sep 2019 19:26:27 -0400 | ||
4 | Subject: [PATCH 24/26] Include signal.h | ||
5 | |||
6 | Fixes several signal set related errors: | ||
7 | src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] | ||
8 | src/basic/copy.c:93:19: error: implicit declaration of function 'sigaddset' [-Werror=implicit-function-declaration] | ||
9 | src/basic/copy.c:93:34: error: 'SIGINT' undeclared (first use in this function) | ||
10 | src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [-Werror=implicit-function-declaration] | ||
11 | |||
12 | Upstream-Status: Pending | ||
13 | |||
14 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> | ||
15 | --- | ||
16 | src/basic/copy.c | 1 + | ||
17 | 1 file changed, 1 insertion(+) | ||
18 | |||
19 | diff --git a/src/basic/copy.c b/src/basic/copy.c | ||
20 | index 6a9c3a396f..8948bb4013 100644 | ||
21 | --- a/src/basic/copy.c | ||
22 | +++ b/src/basic/copy.c | ||
23 | @@ -8,6 +8,7 @@ | ||
24 | #include <sys/sendfile.h> | ||
25 | #include <sys/xattr.h> | ||
26 | #include <unistd.h> | ||
27 | +#include <signal.h> | ||
28 | |||
29 | #include "alloc-util.h" | ||
30 | #include "btrfs-util.h" | ||
31 | -- | ||
32 | 2.27.0 | ||
33 | |||
diff --git a/meta/recipes-core/systemd/systemd_247.3.bb b/meta/recipes-core/systemd/systemd_247.3.bb index b1a38ba9b8..a99e543a77 100644 --- a/meta/recipes-core/systemd/systemd_247.3.bb +++ b/meta/recipes-core/systemd/systemd_247.3.bb | |||
@@ -51,8 +51,6 @@ SRC_URI_MUSL = "\ | |||
51 | file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ | 51 | file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ |
52 | file://0021-test-json.c-define-M_PIl.patch \ | 52 | file://0021-test-json.c-define-M_PIl.patch \ |
53 | file://0022-do-not-disable-buffer-in-writing-files.patch \ | 53 | file://0022-do-not-disable-buffer-in-writing-files.patch \ |
54 | file://0023-Include-sys-wait.h.patch \ | ||
55 | file://0024-Include-signal.h.patch \ | ||
56 | file://0025-Handle-__cpu_mask-usage.patch \ | 54 | file://0025-Handle-__cpu_mask-usage.patch \ |
57 | file://0026-Handle-missing-gshadow.patch \ | 55 | file://0026-Handle-missing-gshadow.patch \ |
58 | " | 56 | " |