diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch | 40 |
1 files changed, 0 insertions, 40 deletions
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 f74de43849..0000000000 --- a/meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From 9abbc5e69e21aef0d4d4567e69302fa660b76c53 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 20/26] 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 | src/nspawn/nspawn.c | 2 +- | ||
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
24 | |||
25 | diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c | ||
26 | index 0842731c18..3528b7ff14 100644 | ||
27 | --- a/src/nspawn/nspawn.c | ||
28 | +++ b/src/nspawn/nspawn.c | ||
29 | @@ -5084,7 +5084,7 @@ static int cant_be_in_netns(void) { | ||
30 | if (fd < 0) | ||
31 | return log_error_errno(errno, "Failed to allocate udev control socket: %m"); | ||
32 | |||
33 | - if (connect(fd, &sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { | ||
34 | + if (connect(fd, (struct sockaddr *)&sa.un, SOCKADDR_UN_LEN(sa.un)) < 0) { | ||
35 | |||
36 | if (errno == ENOENT || ERRNO_IS_DISCONNECT(errno)) | ||
37 | return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), | ||
38 | -- | ||
39 | 2.27.0 | ||
40 | |||