diff options
Diffstat (limited to 'meta/recipes-core/systemd')
4 files changed, 0 insertions, 93 deletions
diff --git a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch b/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch deleted file mode 100644 index 5ee212a4e7..0000000000 --- a/meta/recipes-core/systemd/systemd/0017-missing_type.h-add-__compar_d_fn_t-definition.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 68bb59615e91c4d3e5eb2076979c2b760f4bf027 Mon Sep 17 00:00:00 2001 | ||
2 | From: Chen Qi <Qi.Chen@windriver.com> | ||
3 | Date: Mon, 25 Feb 2019 15:27:54 +0800 | ||
4 | Subject: [PATCH] missing_type.h: add __compar_d_fn_t definition | ||
5 | |||
6 | Fix the following compile failure: | ||
7 | src/basic/util.h:71:18: error: unknown type name '__compar_d_fn_t'; did you mean '__compar_fn_t'? | ||
8 | |||
9 | Upstream-Status: Inappropriate [musl specific] | ||
10 | |||
11 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
12 | |||
13 | --- | ||
14 | src/basic/missing_type.h | 1 + | ||
15 | 1 file changed, 1 insertion(+) | ||
16 | |||
17 | diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h | ||
18 | index 3df1084ef2..697aa7f58a 100644 | ||
19 | --- a/src/basic/missing_type.h | ||
20 | +++ b/src/basic/missing_type.h | ||
21 | @@ -13,6 +13,7 @@ | ||
22 | |||
23 | #ifndef __GLIBC__ | ||
24 | typedef int (*comparison_fn_t)(const void *, const void *); | ||
25 | +typedef int (*__compar_d_fn_t) (const void *, const void *, void *); | ||
26 | #endif | ||
27 | |||
28 | #ifndef __COMPAR_FN_T | ||
diff --git a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch b/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch deleted file mode 100644 index 662f8110db..0000000000 --- a/meta/recipes-core/systemd/systemd/0019-Handle-missing-LOCK_EX.patch +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | From f1574cf91340800cf8253e922b2c613d6b9b5e4a Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
3 | Date: Fri, 7 Aug 2020 15:19:27 +0000 | ||
4 | Subject: [PATCH] Handle missing LOCK_EX | ||
5 | |||
6 | Upstream-Status: Inappropriate [musl specific] | ||
7 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
8 | |||
9 | --- | ||
10 | src/partition/makefs.c | 1 + | ||
11 | 1 file changed, 1 insertion(+) | ||
12 | |||
13 | diff --git a/src/partition/makefs.c b/src/partition/makefs.c | ||
14 | index b6979b7e4f..63d70d861e 100644 | ||
15 | --- a/src/partition/makefs.c | ||
16 | +++ b/src/partition/makefs.c | ||
17 | @@ -6,6 +6,7 @@ | ||
18 | #include <sys/stat.h> | ||
19 | #include <sys/types.h> | ||
20 | #include <unistd.h> | ||
21 | +#include <sys/file.h> | ||
22 | |||
23 | #include "alloc-util.h" | ||
24 | #include "blockdev-util.h" | ||
diff --git a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch b/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch deleted file mode 100644 index 70ac8b607c..0000000000 --- a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | From d2f3293ceb22731e0e97945f0d1132e356b66d07 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alex Kiernan <alex.kiernan@gmail.com> | ||
3 | Date: Fri, 7 Aug 2020 15:20:17 +0000 | ||
4 | Subject: [PATCH] Fix incompatible pointer type struct sockaddr_un * | ||
5 | |||
6 | | ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c: In function 'cant_be_in_netns': | ||
7 | | ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:4893:25: error: passing argument 2 of 'connect' from incompatible pointer type [-Werror=incompatible-pointer-types] | ||
8 | | 4893 | if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { | ||
9 | | | ^~~~~~ | ||
10 | | | | | ||
11 | | | struct sockaddr_un * | ||
12 | | In file included from ../../../../../../workspace/sources/systemd/src/systemd/sd-daemon.h:22, | ||
13 | | from ../../../../../../workspace/sources/systemd/src/nspawn/nspawn.c:21: | ||
14 | | /home/ubuntu/poky/build/tmp/work/core2-64-poky-linux-musl/systemd/1_246-r0/recipe-sysroot/usr/include/sys/socket.h:384:19: note: expected 'const struct sockaddr *' but argument is of type 'struct sockaddr_un *' | ||
15 | | 384 | int connect (int, const struct sockaddr *, socklen_t); | ||
16 | | | ^~~~~~~~~~~~~~~~~~~~~~~ | ||
17 | | cc1: some warnings being treated as errors | ||
18 | |||
19 | Upstream-Status: Inappropriate [musl specific] | ||
20 | Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> | ||
21 | |||
22 | --- | ||
23 | src/nspawn/nspawn.c | 2 +- | ||
24 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | ||
27 | index a2af4948c0..fb6af295b5 100644 | ||
28 | --- a/src/nspawn/nspawn.c | ||
29 | +++ b/src/nspawn/nspawn.c | ||
30 | @@ -5399,7 +5399,7 @@ static int cant_be_in_netns(void) { | ||
31 | if (fd < 0) | ||
32 | return log_error_errno(errno, "Failed to allocate udev control socket: %m"); | ||
33 | |||
34 | - if (connect(fd, &sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) { | ||
35 | + if (connect(fd, (struct sockaddr *)&sa.sa, SOCKADDR_UN_LEN(sa.un)) < 0) { | ||
36 | |||
37 | if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) | ||
38 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), | ||
diff --git a/meta/recipes-core/systemd/systemd_250.5.bb b/meta/recipes-core/systemd/systemd_250.5.bb index e5a2f65202..2f5b9d1367 100644 --- a/meta/recipes-core/systemd/systemd_250.5.bb +++ b/meta/recipes-core/systemd/systemd_250.5.bb | |||
@@ -45,10 +45,7 @@ SRC_URI_MUSL = "\ | |||
45 | file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ | 45 | file://0014-Do-not-disable-buffering-when-writing-to-oom_score_a.patch \ |
46 | file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ | 46 | file://0015-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch \ |
47 | file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ | 47 | file://0016-Hide-__start_BUS_ERROR_MAP-and-__stop_BUS_ERROR_MAP.patch \ |
48 | file://0017-missing_type.h-add-__compar_d_fn_t-definition.patch \ | ||
49 | file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ | 48 | file://0018-avoid-redefinition-of-prctl_mm_map-structure.patch \ |
50 | file://0019-Handle-missing-LOCK_EX.patch \ | ||
51 | file://0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch \ | ||
52 | file://0021-test-json.c-define-M_PIl.patch \ | 49 | file://0021-test-json.c-define-M_PIl.patch \ |
53 | file://0022-do-not-disable-buffer-in-writing-files.patch \ | 50 | file://0022-do-not-disable-buffer-in-writing-files.patch \ |
54 | file://0025-Handle-__cpu_mask-usage.patch \ | 51 | file://0025-Handle-__cpu_mask-usage.patch \ |