systemd: Fix build with latest musl
PATCH 1/3 systemd: Fix build with latest musl
musl has removed basename from string.h [1] which leads to build failures now as declaration is gone and it should be coming from libgen.h
[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7
--- ...patible-basename-for-non-glibc-syste.patch | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-)
meta/recipes-core/systemd/systemd/0017-Define-glibc-compatible-basename-for-non-glibc-syste.patch +8 -14
@@ -13,22 +13,16 @@ Signed-off-by: Khem Raj <[email protected]> src/machine/machine-dbus.c | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c -index 45bc056326..aee51d5da5 100644 ---- a/src/machine/machine-dbus.c -+++ b/src/machine/machine-dbus.c -@@ -4,6 +4,11 @@ - #include <sys/mount.h> - #include <sys/wait.h> +--- a/src/basic/string-util.h ++++ b/src/basic/string-util.h +@@ -26,6 +26,10 @@ + #define URI_UNRESERVED ALPHANUMERICAL "-._~" /* [RFC3986] */ + #define URI_VALID URI_RESERVED URI_UNRESERVED /* [RFC3986] */ +#if !defined(__GLIBC__) -+#include <string.h> +#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) +#endif + - #include "alloc-util.h" - #include "bus-common-errors.h" - #include "bus-get-properties.h" --- -2.39.2 - + static inline char* strstr_ptr(const char *haystack, const char *needle) { + if (!haystack || !needle) + return NULL;
Signature · 1 line
2.43.0
PATCH 2/3 qemu: Fix build with latest musl
musl dropped basename() from string.h, adjust for that
--- meta/recipes-devtools/qemu/qemu.inc | 1 + ...io-Include-libgen.h-for-basename-API.patch | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/0001-vfio-Include-libgen.h-for-basename-API.patch
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -31,6 +31,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ file://fixedmeson.patch \ file://fixmips.patch \ + file://0001-vfio-Include-libgen.h-for-basename-API.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ "
meta/recipes-devtools/qemu/qemu/0001-vfio-Include-libgen.h-for-basename-API.patch new file +57 -0
57 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH 3/3 qemu: Add packageconfig knob to enable pipewire support
In reply to Khem RajThis gets into a quessing mode if not specified and it it probelamactic for native version since it maybe built on a machine having pipewire
installed and used on another where pipewire is not installed ( minimal CI builder ) it ends up with
runqemu - ERROR - Failed to run qemu: /mnt/b/yoe/master/build/tmp/work/x86_64-linux/qemu-helper-native/1.0/recipe-sysroot-native/usr/bin/qemu-system-x86_64: error while loading shared libraries: libpipewire-0.3.so.0: cannot open shared object file: No such file or directory
--- meta/recipes-devtools/qemu/qemu.inc | 1 + 1 file changed, 1 insertion(+)
meta/recipes-devtools/qemu/qemu.inc +1 -0
@@ -233,6 +233,7 @@ PACKAGECONFIG[slirp] = "--enable-slirp,--disable-slirp,libslirp" PACKAGECONFIG[brlapi] = "--enable-brlapi,--disable-brlapi" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack," PACKAGECONFIG[debuginfo] = "--enable-libdw,--disable-libdw,elfutils" +PACKAGECONFIG[pipewire] = "--enable-pipewire,--disable-pipewire,pipewire" INSANE_SKIP:${PN}-common = "arch"
Signature · 1 line
2.43.0