mirror of
https://git.yoctoproject.org/poky
synced 2026-05-31 12:49:46 +00:00
systemd: Define basename() for musl
(From OE-Core rev: 167098cdd875a02221ff6d15f443c02c1bcdc33f) (From OE-Core rev: 5ff707e15c68d77c371b43a970e62302f7492545) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
+33
@@ -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
|
||||||
|
|
||||||
@@ -53,6 +53,7 @@ SRC_URI += "file://touchscreen.rules \
|
|||||||
file://0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch \
|
file://0033-basic-macros-rename-noreturn-into-_noreturn_-8456.patch \
|
||||||
file://libmount.patch \
|
file://libmount.patch \
|
||||||
file://0034-Fix-format-truncation-compile-failure-by-typecasting.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"
|
SRC_URI_append_qemuall = " file://0001-core-device.c-Change-the-default-device-timeout-to-2.patch"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user