Skip to contentSkip to conversation

attr: Disable attr.test on musl

PATCH New Khem Raj 1 participant 3 messages Apr 21, 2023

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/3 attr: Disable attr.test on musl

the error message in musl based systems is
EXPECTED: Operation not supported
RECIEVED: Not supported

The test is then marked as failed due to this.
Ignore this test on musl

---
 meta/recipes-support/attr/attr.inc | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-support/attr/attr.inc +4 -0
index ab62563690..8ba865a74a 100644
@@ -48,6 +48,10 @@ do_install_ptest() {
 	cp -rf ${S}/test/ ${D}${PTEST_PATH}
 }
 
+do_install_ptest:append:libc-musl() {
+        sed -i -e 's|f: Operation n|f: N|g' ${D}${PTEST_PATH}/test/attr.test
+}
+
 RDEPENDS:${PN}-ptest = "attr \
                         bash \
                         coreutils \
Signature · 1 line
2.40.0
author
#1 lore raw

PATCH 2/3 acl: Disable misc.test on musl

misc.test fails on musl due to nftw order, ignore it for now

---
 meta/recipes-support/attr/acl_2.3.1.bb | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-support/attr/acl_2.3.1.bb +4 -0
index 9cb19ed72f..9badd33254 100644
@@ -61,6 +61,10 @@ do_install_ptest() {
         rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai
 }
 
+do_install_ptest:append:libc-musl() {
+        sed -i -e '/test\/misc.test/d' ${D}${PTEST_PATH}/Makefile
+}
+
 RDEPENDS:${PN}-ptest = "acl \
                         bash \
                         coreutils \
Signature · 1 line
2.40.0
author
#2 lore raw

PATCH 3/3 fts: Fix typo in summary

In reply to Khem Raj
---
 meta/recipes-core/fts/fts_1.2.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-core/fts/fts_1.2.7.bb +1 -1
index d3b0f31eda..10103830af 100644
@@ -1,7 +1,7 @@
 # Copyright (C) 2015 Khem Raj <[email protected]>
 # Released under the MIT license (see COPYING.MIT for the terms)
 
-SUMMARY = "Implementation of ftsfor musl libc packages"
+SUMMARY = "Implementation of fts for musl libc packages"
 HOMEPAGE = "https://github.com/pullmoll/musl-fts"
 DESCRIPTION = "The musl-fts package implements the fts(3) functions fts_open, fts_read, fts_children, fts_set and fts_close, which are missing in musl libc."
 LICENSE = "BSD-3-Clause"
Signature · 1 line
2.40.0