diff options
author | Adrian Bunk <bunk@stusta.de> | 2019-05-18 09:51:24 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-21 12:56:33 +0100 |
commit | 3b06404e30e1f163175002ec95ec39b9e7a21e00 (patch) | |
tree | 0f4ba2f95f2b7478acfc537704d5d10345deaa45 /meta/recipes-core | |
parent | ca3de9df8affe61bcb5b8d17139f1faa8d018c77 (diff) | |
download | poky-3b06404e30e1f163175002ec95ec39b9e7a21e00.tar.gz |
systemd: Some upstreamable musl patches have been upstreamed
(From OE-Core rev: 71f99af0d05656a4546e691f6b6e876776c22b13)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
7 files changed, 105 insertions, 80 deletions
diff --git a/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch new file mode 100644 index 0000000000..6f192a2ad2 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch | |||
@@ -0,0 +1,50 @@ | |||
1 | From f491dfdc88ddbba36a24a75b2063aff027461b83 Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Bunk <bunk@stusta.de> | ||
3 | Date: Thu, 16 May 2019 22:20:07 +0300 | ||
4 | Subject: Replace the legacy ULONG_LONG_MAX with the C99 ULLONG_MAX | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
8 | --- | ||
9 | src/journal-remote/journal-remote-main.c | 4 ++-- | ||
10 | src/shutdown/shutdown.c | 2 +- | ||
11 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c | ||
14 | index 2321a91e7b..d32c51c3ce 100644 | ||
15 | --- a/src/journal-remote/journal-remote-main.c | ||
16 | +++ b/src/journal-remote/journal-remote-main.c | ||
17 | @@ -528,7 +528,7 @@ static int dispatch_http_event(sd_event_source *event, | ||
18 | void *userdata) { | ||
19 | MHDDaemonWrapper *d = userdata; | ||
20 | int r; | ||
21 | - MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX; | ||
22 | + MHD_UNSIGNED_LONG_LONG timeout = ULLONG_MAX; | ||
23 | |||
24 | assert(d); | ||
25 | |||
26 | @@ -538,7 +538,7 @@ static int dispatch_http_event(sd_event_source *event, | ||
27 | return log_error_errno(SYNTHETIC_ERRNO(EINVAL), | ||
28 | "MHD_run failed!"); | ||
29 | if (MHD_get_timeout(d->daemon, &timeout) == MHD_NO) | ||
30 | - timeout = ULONG_LONG_MAX; | ||
31 | + timeout = ULLONG_MAX; | ||
32 | |||
33 | r = sd_event_source_set_time(d->timer_event, timeout); | ||
34 | if (r < 0) { | ||
35 | diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c | ||
36 | index 35b2c2aa46..9623fe9ea2 100644 | ||
37 | --- a/src/shutdown/shutdown.c | ||
38 | +++ b/src/shutdown/shutdown.c | ||
39 | @@ -212,7 +212,7 @@ static int sync_making_progress(unsigned long long *prev_dirty) { | ||
40 | } | ||
41 | |||
42 | static void sync_with_progress(void) { | ||
43 | - unsigned long long dirty = ULONG_LONG_MAX; | ||
44 | + unsigned long long dirty = ULLONG_MAX; | ||
45 | unsigned checks; | ||
46 | pid_t pid; | ||
47 | int r; | ||
48 | -- | ||
49 | 2.20.1 | ||
50 | |||
diff --git a/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch b/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch new file mode 100644 index 0000000000..565deba1d0 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0001-src-udev-udev-event.c-must-include-sys-wait.h.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From 010f917cf222d2c7205584056fe0e4c581a2e1b1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Adrian Bunk <bunk@stusta.de> | ||
3 | Date: Thu, 16 May 2019 22:09:46 +0300 | ||
4 | Subject: src/udev/udev-event.c must #include <sys/wait.h> | ||
5 | |||
6 | Fixes the following build failure with musl: | ||
7 | ../git/src/udev/udev-event.c: In function 'spawn_wait': | ||
8 | ../git/src/udev/udev-event.c:600:53: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? | ||
9 | r = sd_event_add_child(e, NULL, spawn->pid, WEXITED, on_spawn_sigchld, spawn); | ||
10 | ^~~~~~~ | ||
11 | |||
12 | This looks like a bug in udev-event.c that could also have broken | ||
13 | the compilation after some future glibc header reshuffle. | ||
14 | |||
15 | Upstream-Status: Backport | ||
16 | Signed-off-by: Adrian Bunk <bunk@stusta.de> | ||
17 | --- | ||
18 | src/udev/udev-event.c | 1 + | ||
19 | 1 file changed, 1 insertion(+) | ||
20 | |||
21 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c | ||
22 | index cab1b5ac0c..a0a7ac0f9e 100644 | ||
23 | --- a/src/udev/udev-event.c | ||
24 | +++ b/src/udev/udev-event.c | ||
25 | @@ -7,6 +7,7 @@ | ||
26 | #include <stddef.h> | ||
27 | #include <stdio.h> | ||
28 | #include <stdlib.h> | ||
29 | +#include <sys/wait.h> | ||
30 | #include <unistd.h> | ||
31 | |||
32 | #include "sd-event.h" | ||
33 | -- | ||
34 | 2.20.1 | ||
35 | |||
diff --git a/meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch b/meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch deleted file mode 100644 index dbaae4f398..0000000000 --- a/meta/recipes-core/systemd/systemd/0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From aa6cd19ae428769a38fe7d95f98db0a9c19ae90a Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 25 Feb 2019 15:14:49 +0800 | ||
4 | Subject: [PATCH 12/24] fix missing ULONG_LONG_MAX definition in case of musl | ||
5 | |||
6 | Upstream-Status: Inappropriate [musl] | ||
7 | |||
8 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
9 | --- | ||
10 | src/basic/missing_type.h | 4 ++++ | ||
11 | 1 file changed, 4 insertions(+) | ||
12 | |||
13 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | ||
14 | index 23602eb..7d7c1e4 100644 | ||
15 | --- a/src/basic/missing_type.h | ||
16 | +++ b/src/basic/missing_type.h | ||
17 | @@ -39,3 +39,7 @@ typedef int (*__compar_fn_t)(const void *, const void *); | ||
18 | #ifndef FTW_SKIP_SIBLINGS | ||
19 | #define FTW_SKIP_SIBLINGS 3 | ||
20 | #endif | ||
21 | + | ||
22 | +#ifndef ULONG_LONG_MAX | ||
23 | +#define ULONG_LONG_MAX ULLONG_MAX | ||
24 | +#endif | ||
25 | -- | ||
26 | 2.7.4 | ||
27 | |||
diff --git a/meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch b/meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch deleted file mode 100644 index 47212bc3c1..0000000000 --- a/meta/recipes-core/systemd/systemd/0022-include-sys-wait.h-to-avoid-compile-failure.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From 6c5364736f5afd1106ac240f03806af53979cc60 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 25 Feb 2019 15:56:50 +0800 | ||
4 | Subject: [PATCH 22/24] include sys/wait.h to avoid compile failure | ||
5 | |||
6 | Fix the following error: | ||
7 | src/udev/udev-event.c:581:53: error: 'WEXITED' undeclared (first use in this function); did you mean 'WIFEXITED'? | ||
8 | |||
9 | Upstream-Status: Inappropriate [musl specific] | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | --- | ||
13 | src/udev/udev-event.c | 4 +++- | ||
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c | ||
17 | index 07b7365..e532bb7 100644 | ||
18 | --- a/src/udev/udev-event.c | ||
19 | +++ b/src/udev/udev-event.c | ||
20 | @@ -8,7 +8,9 @@ | ||
21 | #include <stdio.h> | ||
22 | #include <stdlib.h> | ||
23 | #include <unistd.h> | ||
24 | - | ||
25 | +#ifndef __GLIBC__ | ||
26 | +#include <sys/wait.h> | ||
27 | +#endif | ||
28 | #include "sd-event.h" | ||
29 | |||
30 | #include "alloc-util.h" | ||
31 | -- | ||
32 | 2.7.4 | ||
33 | |||
diff --git a/meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch b/meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch index 22186b8a7e..37987b57f6 100644 --- a/meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch +++ b/meta/recipes-core/systemd/systemd/0023-socket-util.h-include-string.h.patch | |||
@@ -1,12 +1,12 @@ | |||
1 | From 93e6b81b721d9eb966a257bfdf7df6e8280b885c Mon Sep 17 00:00:00 2001 | 1 | From 56fb30d93e96d7f983af0cb4dff9155da91dd671 Mon Sep 17 00:00:00 2001 |
2 | From: Chen Qi <Qi.Chen@windriver.com> | 2 | From: Chen Qi <Qi.Chen@windriver.com> |
3 | Date: Mon, 25 Feb 2019 16:37:19 +0800 | 3 | Date: Mon, 25 Feb 2019 16:37:19 +0800 |
4 | Subject: [PATCH 23/24] socket-util.h: include string.h | 4 | Subject: socket-util.h: include string.h |
5 | 5 | ||
6 | Fix the following compile error: | 6 | Fix the following compile error: |
7 | src/basic/socket-util.h:187:30: error: implicit declaration of function 'strnlen'; did you mean 'strlen'? [-Werror=implicit-function-declaration] | 7 | src/basic/socket-util.h:187:30: error: implicit declaration of function 'strnlen'; did you mean 'strlen'? [-Werror=implicit-function-declaration] |
8 | 8 | ||
9 | Upstream-Status: Pending | 9 | Upstream-Status: Accepted |
10 | 10 | ||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | 11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
12 | --- | 12 | --- |
@@ -14,17 +14,17 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | |||
14 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
15 | 15 | ||
16 | diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h | 16 | diff --git a/src/basic/socket-util.h b/src/basic/socket-util.h |
17 | index 574d2b7..097aa4d 100644 | 17 | index 6920fd99ba..36ec422f2c 100644 |
18 | --- a/src/basic/socket-util.h | 18 | --- a/src/basic/socket-util.h |
19 | +++ b/src/basic/socket-util.h | 19 | +++ b/src/basic/socket-util.h |
20 | @@ -12,6 +12,7 @@ | 20 | @@ -9,6 +9,7 @@ |
21 | #include <netinet/in.h> | ||
22 | #include <stdbool.h> | ||
23 | #include <stddef.h> | ||
24 | +#include <string.h> | ||
21 | #include <sys/socket.h> | 25 | #include <sys/socket.h> |
22 | #include <sys/types.h> | 26 | #include <sys/types.h> |
23 | #include <sys/un.h> | 27 | #include <sys/un.h> |
24 | +#include <string.h> | ||
25 | |||
26 | #include "macro.h" | ||
27 | #include "missing_socket.h" | ||
28 | -- | 28 | -- |
29 | 2.7.4 | 29 | 2.20.1 |
30 | 30 | ||
diff --git a/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch b/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch index bae9d3eaad..ada404b053 100644 --- a/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch +++ b/meta/recipes-core/systemd/systemd/0025-fs-utilh-add-missing-sys-stat-include.patch | |||
@@ -1,30 +1,30 @@ | |||
1 | From 2560a6b7b9adc5bd5dec0f87c2e3025ced8a2af2 Mon Sep 17 00:00:00 2001 | 1 | From 56e3c9581e2c9b7435d5fcbd74b47c7ccf6b3891 Mon Sep 17 00:00:00 2001 |
2 | From: Andrej Valek <andrej.valek@siemens.com> | 2 | From: Andrej Valek <andrej.valek@siemens.com> |
3 | Date: Thu, 18 Apr 2019 10:47:11 +0200 | 3 | Date: Thu, 18 Apr 2019 10:47:11 +0200 |
4 | Subject: [PATCH] fs-utilh: add missing sys/stat include | 4 | Subject: fs-util.h: add missing sys/stat include |
5 | 5 | ||
6 | fix error: | 6 | fix error: |
7 | | error: passing argument 5 of 'chase_symlinks_and_stat' from incompatible pointer type [-Werror=incompatible-pointer-types] | 7 | | error: passing argument 5 of 'chase_symlinks_and_stat' from incompatible pointer type [-Werror=incompatible-pointer-types] |
8 | 8 | ||
9 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> | 9 | Signed-off-by: Andrej Valek <andrej.valek@siemens.com> |
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Accepted |
12 | --- | 12 | --- |
13 | src/basic/fs-util.h | 1 + | 13 | src/basic/fs-util.h | 1 + |
14 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
15 | 15 | ||
16 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h | 16 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h |
17 | index b965120..e2fdfff 100644 | 17 | index b9651205e6..c153bc4448 100644 |
18 | --- a/src/basic/fs-util.h | 18 | --- a/src/basic/fs-util.h |
19 | +++ b/src/basic/fs-util.h | 19 | +++ b/src/basic/fs-util.h |
20 | @@ -8,6 +8,7 @@ | 20 | @@ -7,6 +7,7 @@ |
21 | #include <stdbool.h> | ||
21 | #include <stdint.h> | 22 | #include <stdint.h> |
22 | #include <sys/inotify.h> | 23 | #include <sys/inotify.h> |
23 | #include <sys/types.h> | ||
24 | +#include <sys/stat.h> | 24 | +#include <sys/stat.h> |
25 | #include <sys/types.h> | ||
25 | #include <unistd.h> | 26 | #include <unistd.h> |
26 | 27 | ||
27 | #include "errno-util.h" | ||
28 | -- | 28 | -- |
29 | 2.11.0 | 29 | 2.20.1 |
30 | 30 | ||
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index 20714fc70a..2dda0d0b95 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/meta/recipes-core/systemd/systemd_242.bb | |||
@@ -38,7 +38,7 @@ SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.pa | |||
38 | file://0008-add-missing-FTW_-macros-for-musl.patch \ | 38 | file://0008-add-missing-FTW_-macros-for-musl.patch \ |
39 | file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ | 39 | file://0010-fix-missing-of-__register_atfork-for-non-glibc-build.patch \ |
40 | file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ | 40 | file://0011-Use-uintmax_t-for-handling-rlim_t.patch \ |
41 | file://0012-fix-missing-ULONG_LONG_MAX-definition-in-case-of-mus.patch \ | 41 | file://0001-Replace-the-legacy-ULONG_LONG_MAX-with-the-C99-ULLON.patch \ |
42 | file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ | 42 | file://0014-test-sizeof.c-Disable-tests-for-missing-typedefs-in-.patch \ |
43 | file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ | 43 | file://0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch \ |
44 | file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ | 44 | file://0016-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ |
@@ -47,7 +47,7 @@ SRC_URI_MUSL = "file://0001-Use-getenv-when-secure-versions-are-not-available.pa | |||
47 | file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ | 47 | file://0019-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ |
48 | file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ | 48 | file://0020-missing_type.h-add-__compar_d_fn_t-definition.patch \ |
49 | file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ | 49 | file://0021-avoid-redefinition-of-prctl_mm_map-structure.patch \ |
50 | file://0022-include-sys-wait.h-to-avoid-compile-failure.patch \ | 50 | file://0001-src-udev-udev-event.c-must-include-sys-wait.h.patch \ |
51 | file://0023-socket-util.h-include-string.h.patch \ | 51 | file://0023-socket-util.h-include-string.h.patch \ |
52 | file://0024-test-json.c-define-M_PIl.patch \ | 52 | file://0024-test-json.c-define-M_PIl.patch \ |
53 | file://0025-fs-utilh-add-missing-sys-stat-include.patch \ | 53 | file://0025-fs-utilh-add-missing-sys-stat-include.patch \ |