These two header fixes are not needed with the current source as the headers are there through other header files. Drop the patches.
Signed-off-by: Richard Purdie <[email protected]> --- .../systemd/0023-Include-sys-wait.h.patch | 31 ----------------- .../systemd/0024-Include-signal.h.patch | 33 ------------------- meta/recipes-core/systemd/systemd_247.3.bb | 2 -- 3 files changed, 66 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch delete mode 100644 meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch 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 ea4a024b82b..00000000000 --- a/meta/recipes-core/systemd/systemd/0023-Include-sys-wait.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 359e7a38824a906b0a24f5775f41a2ae3358bf06 Mon Sep 17 00:00:00 2001 -From: Scott Murray <[email protected]> -Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH 23/26] Include sys/wait.h - -Fixes: -src/login/logind-brightness.c:158:85: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? - 158 | r = sd_event_add_child(w->manager->event, &w->child_event_source, w->child, WEXITED, on_brightness_writer_exit, w); - | ^~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Scott Murray <[email protected]> ---- - src/login/logind-brightness.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/login/logind-brightness.c b/src/login/logind-brightness.c -index a6a1603396..54848ce209 100644 ---- a/src/login/logind-brightness.c -+++ b/src/login/logind-brightness.c -@@ -1,5 +1,6 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - -+#include <sys/wait.h> - #include "bus-util.h" - #include "device-util.h" - #include "hash-funcs.h" --- -2.27.0 - 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 2820d7b322c..00000000000 --- a/meta/recipes-core/systemd/systemd/0024-Include-signal.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0592da08e16a17ceef0949ec9901397d8ec5af92 Mon Sep 17 00:00:00 2001 -From: Scott Murray <[email protected]> -Date: Fri, 13 Sep 2019 19:26:27 -0400 -Subject: [PATCH 24/26] Include signal.h - -Fixes several signal set related errors: -src/basic/copy.c:92:19: error: implicit declaration of function 'sigemptyset' [-Werror=implicit-function-declaration] -src/basic/copy.c:93:19: error: implicit declaration of function 'sigaddset' [-Werror=implicit-function-declaration] -src/basic/copy.c:93:34: error: 'SIGINT' undeclared (first use in this function) -src/basic/copy.c:95:13: error: implicit declaration of function 'sigtimedwait' [-Werror=implicit-function-declaration] - -Upstream-Status: Pending - -Signed-off-by: Scott Murray <[email protected]> ---- - src/basic/copy.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/copy.c b/src/basic/copy.c -index 6a9c3a396f..8948bb4013 100644 ---- a/src/basic/copy.c -+++ b/src/basic/copy.c -@@ -8,6 +8,7 @@ - #include <sys/sendfile.h> - #include <sys/xattr.h> - #include <unistd.h> -+#include <signal.h> - - #include "alloc-util.h" - #include "btrfs-util.h" --- -2.27.0 - diff --git a/meta/recipes-core/systemd/systemd_247.3.bb b/meta/recipes-core/systemd/systemd_247.3.bb index b1a38ba9b88..a99e543a779 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 = "\ file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ file://0021-test-json.c-define-M_PIl.patch \ file://0022-do-not-disable-buffer-in-writing-files.patch \ - file://0023-Include-sys-wait.h.patch \ - file://0024-Include-signal.h.patch \ file://0025-Handle-__cpu_mask-usage.patch \ file://0026-Handle-missing-gshadow.patch \ " -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#148183): https://lists.openembedded.org/g/openembedded-core/message/148183 Mute This Topic: https://lists.openembedded.org/mt/80685187/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
