systemd: Add another fix for using XSI strerror_r
PATCH 1/3 systemd: Add another fix for using XSI strerror_r
This makes systemd continue to work on musl
--- ...util-Make-STRERROR-portable-for-musl.patch | 42 +++++++++++++++++++ meta/recipes-core/systemd/systemd_252.4.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-core/systemd/systemd/0001-errno-util-Make-STRERROR-portable-for-musl.patch
meta/recipes-core/systemd/systemd/0001-errno-util-Make-STRERROR-portable-for-musl.patch new file +42 -0
@@ -0,0 +1,42 @@ +From f66b5c802ce0a3310f5580cfc1b02446f8087568 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Mon, 23 Jan 2023 23:39:46 -0800 +Subject: [PATCH] errno-util: Make STRERROR portable for musl + +Sadly, systemd has decided to use yet another GNU extention in a macro +lets make this such that we can use XSI compliant strerror_r() for +non-glibc hosts + +Upstream-Status: Inappropriate [musl specific] + +Signed-off-by: Khem Raj <[email protected]> +--- + src/basic/errno-util.h | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/basic/errno-util.h b/src/basic/errno-util.h +index 091f99c590..eb5c1f9961 100644 +--- a/src/basic/errno-util.h ++++ b/src/basic/errno-util.h +@@ -14,8 +14,16 @@ + * https://stackoverflow.com/questions/34880638/compound-literal-lifetime-and-if-blocks + * + * Note that we use the GNU variant of strerror_r() here. */ +-#define STRERROR(errnum) strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN) +- ++static inline const char * STRERROR(int errnum); ++ ++static inline const char * STRERROR(int errnum) { ++#ifdef __GLIBC__ ++ return strerror_r(abs(errnum), (char[ERRNO_BUF_LEN]){}, ERRNO_BUF_LEN); ++#else ++ static __thread char buf[ERRNO_BUF_LEN]; ++ return strerror_r(abs(errnum), buf, ERRNO_BUF_LEN) ? "unknown error" : buf; ++#endif ++} + /* A helper to print an error message or message for functions that return 0 on EOF. + * Note that we can't use ({ … }) to define a temporary variable, so errnum is + * evaluated twice. */ +-- +2.39.1 +
meta/recipes-core/systemd/systemd_252.4.bb +1 -0
@@ -50,6 +50,7 @@ SRC_URI_MUSL = "\ file://0002-Add-sys-stat.h-for-S_IFDIR.patch \ file://0001-Adjust-for-musl-headers.patch \ file://0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch \ + file://0001-errno-util-Make-STRERROR-portable-for-musl.patch \ " PAM_PLUGINS = " \
Signature · 1 line
2.39.1
PATCH 2/3 texinfo: Add missing rdep on needed perl-modules
Fixes
Can't locate Encode.pm in @INC (you may need to install the Encode module) (@INC contains: /usr/lib/perl5/site_perl/5.36.0/x86_64-linux /usr/lib/perl5/site_perl/5.36.0 /usr/lib/perl5/vendor_perl/5.36.0/x86_64-linux
/usr/lib/perl5/vendor_perl/5.36.0 /usr/lib/perl5/5.36.0/x86_64-linux /usr/lib/perl5/5.36.0) at /usr/bin/makeinfo line 29.
The slew of indirect dependencies
--- meta/recipes-extended/texinfo/texinfo_7.0.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta/recipes-extended/texinfo/texinfo_7.0.1.bb +3 -1
@@ -76,7 +76,9 @@ FILES:info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \ ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" -RDEPENDS:${PN} = "perl" +RDEPENDS:${PN} = "perl perl-module-encode perl-module-encode-encoding perl-module-locale perl-module-integer \ + perl-module-if perl-module-unicode-normalize perl-module-base perl-module-feature \ + perl-module-perlio" FILES:${PN}-doc = "${infodir}/texi* \ ${datadir}/${tex_texinfo} \ ${mandir}/man1 ${mandir}/man5"
Signature · 1 line
2.39.1
Re: [OE-core] [PATCH 2/3] texinfo: Add missing rdep on needed perl-modules
Hello,
Quoted 6 lines · Khem Raj
Fixes
Can't locate Encode.pm in @INC (you may need to install the Encode module) (@INC contains:/usr/lib/perl5/site_perl/5.36.0/x86_64-linux/usr/lib/perl5/site_perl/5.36.0/usr/lib/perl5/vendor_perl/5.36.0/x86_64-linux
/usr/lib/perl5/vendor_perl/5.36.0/usr/lib/perl5/5.36.0/x86_64-linux/usr/lib/perl5/5.36.0) at/usr/bin/makeinfoline 29.The slew of indirect dependencies
This breaks most of the builds:
https://autobuilder.yoctoproject.org/typhoon/#/builders/65/builds/6618/steps/15/logs/stdio
Error:
Problem: package nativesdk-perl-module-locale-5.36.0-r0.x86_64_nativesdk requires nativesdk-perl-module-config, but none of the providers can be installed
- package nativesdk-texinfo-7.0.1-r0.x86_64_nativesdk requires nativesdk-perl-module-locale, but none of the providers can be installed
- package nativesdk-buildtools-perl-dummy-1.0-r2.buildtools_dummy_nativesdk conflicts with nativesdk-perl provided by nativesdk-perl-5.36.0-r0.x86_64_nativesdk
- package nativesdk-buildtools-perl-dummy-1.0-r2.buildtools_dummy_nativesdk conflicts with nativesdk-perl-module-strict provided by nativesdk-perl-5.36.0-r0.x86_64_nativesdk
- package nativesdk-buildtools-perl-dummy-1.0-r2.buildtools_dummy_nativesdk conflicts with nativesdk-perl-module-warnings provided by nativesdk-perl-5.36.0-r0.x86_64_nativesdk
- package nativesdk-buildtools-perl-dummy-1.0-r2.buildtools_dummy_nativesdk conflicts with nativesdk-perl-module-vars provided by nativesdk-perl-5.36.0-r0.x86_64_nativesdk
- package nativesdk-buildtools-perl-dummy-1.0-r2.buildtools_dummy_nativesdk obsoletes nativesdk-perl provided by nativesdk-perl-5.36.0-r0.x86_64_nativesdk
- conflicting requests
(try to add '--allowerasing' to command line to replace conflicting packages or '--skip-broken' to skip uninstallable packages)
Quoted 33 lines
Signed-off-by Khem Raj <[email protected]>--- meta/recipes-extended/texinfo/texinfo_7.0.1.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)meta/recipes-extended/texinfo/texinfo_7.0.1.bb +3
-1@@ -76,7 +76,9 @@ FILES:info-doc = "${infodir}/info.info* ${infodir}/dir ${infodir}/info-*.info* \ ${mandir}/man1/infokey.1* ${mandir}/man1/install-info.1*" FILES:${PN} = "${bindir}/makeinfo ${bindir}/texi* ${bindir}/pdftexi2dvi ${bindir}/pod2texi ${datadir}/texinfo" -RDEPENDS:${PN} = "perl" +RDEPENDS:${PN} = "perl perl-module-encode perl-module-encode-encoding perl-module-locale perl-module-integer \ + perl-module-if perl-module-unicode-normalize perl-module-base perl-module-feature \ + perl-module-perlio" FILES:${PN}-doc = "${infodir}/texi* \ ${datadir}/${tex_texinfo} \ ${mandir}/man1 ${mandir}/man5"Signature · 11 lines
2.39.1 -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#176339): https://lists.openembedded.org/g/openembedded-core/message/176339 Mute This Topic: https://lists.openembedded.org/mt/96514819/3617179 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH 3/3 elfutils: Remove funcretval test from run-native-test.sh for now
In reply to Khem Raj--- meta/recipes-devtools/elfutils/elfutils_0.188.bb | 2 ++ 1 file changed, 2 insertions(+)
meta/recipes-devtools/elfutils/elfutils_0.188.bb +2 -0
@@ -98,6 +98,8 @@ do_install_ptest() { cp -r ${B}/debuginfod ${D}${PTEST_PATH} sed -i '/^Makefile:/c Makefile:' ${D}${PTEST_PATH}/tests/Makefile find ${D}${PTEST_PATH} -type f -name *.[hoc] | xargs -i rm {} + # TODO: remove below filter after https://sourceware.org/bugzilla/show_bug.cgi?id=30047 is fixed + sed -i -e '/funcretval/d' ${D}${PTEST_PATH}/tests/run-native-test.sh fi }
Signature · 1 line
2.39.1