diff options
| author | Khem Raj <raj.khem@gmail.com> | 2018-05-28 08:58:32 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-29 21:06:02 +0100 |
| commit | 167098cdd875a02221ff6d15f443c02c1bcdc33f (patch) | |
| tree | 543ba641ddfa364ee510ae5e819ea076af81d845 | |
| parent | 6a3805f06cd7832d70d5b652ec1be612f5f027e6 (diff) | |
| download | openembedded-core-167098cdd875a02221ff6d15f443c02c1bcdc33f.tar.gz openembedded-core-167098cdd875a02221ff6d15f443c02c1bcdc33f.tar.bz2 openembedded-core-167098cdd875a02221ff6d15f443c02c1bcdc33f.zip | |
systemd: Define basename() for musl
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-core/systemd/systemd_237.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch b/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch new file mode 100644 index 0000000000..736d525ad3 --- /dev/null +++ b/meta/recipes-core/systemd/systemd/0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch @@ -0,0 +1,33 @@ +From 5f1f064c81ea30acf93cfa0fb466b38f094f488c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 27 May 2018 08:36:44 -0700 +Subject: [PATCH] Define glibc compatible basename() for non-glibc systems + +Fixes builds with musl, even though systemd is adamant about +using non-posix basename implementation, we have a way out + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/machine/machine-dbus.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c +index 2d7806491b..9a3bdb1d76 100644 +--- a/src/machine/machine-dbus.c ++++ b/src/machine/machine-dbus.c +@@ -29,6 +29,10 @@ + #include <libgen.h> + #undef basename + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif ++ + #include "alloc-util.h" + #include "bus-common-errors.h" + #include "bus-internal.h" +-- +2.17.0 + diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb index c4743a6b9d..2e6558ded1 100644 --- a/meta/recipes-core/systemd/systemd_237.bb +++ b/meta/recipes-core/systemd/systemd_237.bb @@ -53,6 +53,7 @@ SRC_URI += "file://touchscreen.rules \ file://0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch \ file://libmount.patch \ file://0034-Fix-format-truncation-compile-failure-by-typecasting.patch \ + file://0035-Define-glibc-compatible-basename-for-non-glibc-syste.patch \ " SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch" |