diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-05-19 12:29:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-21 08:37:30 +0100 |
commit | 95b348b337cb2932357f67a7ef14464278d1fe62 (patch) | |
tree | 4a424dd957154f5ee5be6da22d0c02d9037db1a1 /meta/recipes-core/systemd/systemd/0020-Fix-incompatible-pointer-type-struct-sockaddr_un.patch | |
parent | 4c54a716d5c37d8915068f9225c7f42ac9a8e980 (diff) | |
download | poky-95b348b337cb2932357f67a7ef14464278d1fe62.tar.gz |
systemd: Drop redundant musl patches
These patches are no longer needed in version 250, they have been
dragged along rebasing over releases unnessarily. Lets remove them
(From OE-Core rev: 216fe2b8e53640ae5794e9426de56cd87637dde4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 | 38 |
1 files changed, 0 insertions, 38 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 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), | ||