diff options
author | Luca Boccassi <luca.boccassi@microsoft.com> | 2020-12-18 09:42:52 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-20 00:03:04 +0000 |
commit | 754d05fffebb69b6abcbe0cac39541aaee551f90 (patch) | |
tree | 1b74251f6b1edf0d1e77490112078b6a9349711d /meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch | |
parent | fae7b0ddba4836d7b1b1d642bd4514ceab50ca09 (diff) | |
download | poky-754d05fffebb69b6abcbe0cac39541aaee551f90.tar.gz |
systemd: update 246 -> 247
Update systemd to v247.2.
Add rule for new oomd dbus conf and for new pam.d
conf directory in /usr/lib|lib64.
Drop selinux-hook-handling-to-enumerate-nexthop.patch,
merged upstream.
Drop 0001-meson-Fix-reallocarray-check.patch,
merged upstream.
Refresh musl patches.
(From OE-Core rev: 1e1d26de68ed13fd53c1a16b9662ac9860dca714)
Signed-off-by: Luca Boccassi <luca.boccassi@microsoft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch new file mode 100644 index 0000000000..89736bcfde --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0013-Define-glibc-compatible-basename-for-non-glibc-syste.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | From dd134880e9a16595ab473934577e873c748e9c7a Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 27 May 2018 08:36:44 -0700 | ||
4 | Subject: [PATCH 13/26] Define glibc compatible basename() for non-glibc | ||
5 | systems | ||
6 | |||
7 | Fixes builds with musl, even though systemd is adamant about | ||
8 | using non-posix basename implementation, we have a way out | ||
9 | |||
10 | Upstream-Status: Inappropriate [musl specific] | ||
11 | |||
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
13 | --- | ||
14 | src/machine/machine-dbus.c | 5 +++++ | ||
15 | 1 file changed, 5 insertions(+) | ||
16 | |||
17 | diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c | ||
18 | index f5780f1aec..aec5825b3e 100644 | ||
19 | --- a/src/machine/machine-dbus.c | ||
20 | +++ b/src/machine/machine-dbus.c | ||
21 | @@ -11,6 +11,11 @@ | ||
22 | #include <libgen.h> | ||
23 | #undef basename | ||
24 | |||
25 | +#if !defined(__GLIBC__) | ||
26 | +#include <string.h> | ||
27 | +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) | ||
28 | +#endif | ||
29 | + | ||
30 | #include "alloc-util.h" | ||
31 | #include "bus-common-errors.h" | ||
32 | #include "bus-get-properties.h" | ||
33 | -- | ||
34 | 2.27.0 | ||
35 | |||