From patchwork Mon Mar 24 17:20:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59815 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BAD6C36002 for ; Mon, 24 Mar 2025 17:20:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.45384.1742836813384332835 for ; Mon, 24 Mar 2025 10:20:13 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id E2EE416F3 for ; Mon, 24 Mar 2025 10:20:18 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 4AED73F58B for ; Mon, 24 Mar 2025 10:20:12 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] perl: add more module RDEPENDS that don't get detected Date: Mon, 24 Mar 2025 17:20:05 +0000 Message-ID: <20250324172008.3110176-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Mar 2025 17:20:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213561 These dependencies are in the source but the dependency generator does not see them. Signed-off-by: Ross Burton --- meta/recipes-devtools/perl/files/perl-rdepends.txt | 2 ++ meta/recipes-devtools/perl/perl_5.40.0.bb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta/recipes-devtools/perl/files/perl-rdepends.txt b/meta/recipes-devtools/perl/files/perl-rdepends.txt index 48e5a9de2f1..462456bba08 100644 --- a/meta/recipes-devtools/perl/files/perl-rdepends.txt +++ b/meta/recipes-devtools/perl/files/perl-rdepends.txt @@ -1,6 +1,8 @@ # Some additional dependencies that the above doesn't manage to figure out +RDEPENDS:perl-module-file-path += "perl-module-file-spec" RDEPENDS:perl-module-file-spec += "perl-module-file-spec-unix" +RDEPENDS:perl-module-file-spec += "perl-module-constant" RDEPENDS:perl-module-scalar-util += "perl-module-list-util" RDEPENDS:perl-module-file-temp += "perl-module-scalar-util" RDEPENDS:perl-module-file-temp += "perl-module-file-spec" diff --git a/meta/recipes-devtools/perl/perl_5.40.0.bb b/meta/recipes-devtools/perl/perl_5.40.0.bb index 30f2431f279..0d4338f29f7 100644 --- a/meta/recipes-devtools/perl/perl_5.40.0.bb +++ b/meta/recipes-devtools/perl/perl_5.40.0.bb @@ -369,7 +369,9 @@ do_create_rdepends_inc() { cat <<'EOPREAMBLE' > ${WORKDIR}/perl-rdepends.inc # Some additional dependencies that the above doesn't manage to figure out +RDEPENDS:${PN}-module-file-path += "${PN}-module-file-spec" RDEPENDS:${PN}-module-file-spec += "${PN}-module-file-spec-unix" +RDEPENDS:${PN}-module-file-spec += "${PN}-module-constant" RDEPENDS:${PN}-module-scalar-util += "${PN}-module-list-util" RDEPENDS:${PN}-module-file-temp += "${PN}-module-scalar-util" RDEPENDS:${PN}-module-file-temp += "${PN}-module-file-spec" From patchwork Mon Mar 24 17:20:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59816 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 99380C36008 for ; Mon, 24 Mar 2025 17:20:14 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.45385.1742836813794517305 for ; Mon, 24 Mar 2025 10:20:13 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8A07B1C14 for ; Mon, 24 Mar 2025 10:20:19 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E6F883F58B for ; Mon, 24 Mar 2025 10:20:12 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] attr: merge .bb and .inc Date: Mon, 24 Mar 2025 17:20:06 +0000 Message-ID: <20250324172008.3110176-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250324172008.3110176-1-ross.burton@arm.com> References: <20250324172008.3110176-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Mar 2025 17:20:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213562 There's only one recipe using the .inc so the split is mostly pointless. Signed-off-by: Ross Burton --- meta/recipes-support/attr/attr.inc | 76 ------------------------- meta/recipes-support/attr/attr_2.5.2.bb | 75 +++++++++++++++++++++++- 2 files changed, 74 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-support/attr/attr.inc diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc deleted file mode 100644 index 5d6929fe507..00000000000 --- a/meta/recipes-support/attr/attr.inc +++ /dev/null @@ -1,76 +0,0 @@ -SUMMARY = "Utilities for manipulating filesystem extended attributes" -DESCRIPTION = "Implement the ability for a user to attach name:value pairs to objects within the XFS filesystem." - -HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" -SECTION = "libs" - -DEPENDS = "virtual/libintl" - -LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" -LICENSE:${PN} = "GPL-2.0-or-later" -LICENSE:lib${BPN} = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ - file://doc/COPYING.LGPL;md5=b8d31f339300bc239d73461d68e77b9c \ - file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ - file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb" - -SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \ - file://run-ptest \ - file://0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch \ -" - -inherit ptest update-alternatives autotools gettext - -PACKAGES =+ "lib${BPN}" - -FILES:lib${BPN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}" - -ALTERNATIVE_PRIORITY = "100" -ALTERNATIVE:${PN} = "setfattr getfattr" -ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" -ALTERNATIVE_TARGET[getfattr] = "${bindir}/getfattr" - -PTEST_BUILD_HOST_FILES = "builddefs" -PTEST_BUILD_HOST_PATTERN = "^RPM" - -do_install_ptest() { - cp ${B}/Makefile ${D}${PTEST_PATH} - sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - -i ${D}${PTEST_PATH}/Makefile - - sed -e "s|^srcdir =.*|srcdir = .|" \ - -e "s|^abs_srcdir =.*|abs_srcdir = .|" \ - -e "s|^abs_top_srcdir =.*|abs_top_srcdir = ..|" \ - -e "s|^Makefile:.*|Makefile:|" \ - -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ - -i ${D}${PTEST_PATH}/Makefile - - cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} - 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 \ - perl-module-constant \ - perl-module-filehandle \ - perl-module-getopt-std \ - perl-module-posix \ - make \ - perl \ - gawk \ - perl-module-cwd \ - perl-module-file-basename \ - perl-module-file-path \ - perl-module-file-spec \ - " - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/attr/attr_2.5.2.bb b/meta/recipes-support/attr/attr_2.5.2.bb index 2110c6d8853..b1a20930ed7 100644 --- a/meta/recipes-support/attr/attr_2.5.2.bb +++ b/meta/recipes-support/attr/attr_2.5.2.bb @@ -1,5 +1,78 @@ -require attr.inc +SUMMARY = "Utilities for manipulating filesystem extended attributes" +DESCRIPTION = "Implement the ability for a user to attach name:value pairs to objects within the XFS filesystem." + +HOMEPAGE = "http://savannah.nongnu.org/projects/attr/" +SECTION = "libs" + +DEPENDS = "virtual/libintl" + +LICENSE = "LGPL-2.1-or-later & GPL-2.0-or-later" +LICENSE:${PN} = "GPL-2.0-or-later" +LICENSE:lib${BPN} = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://doc/COPYING;md5=2d0aa14b3fce4694e4f615e30186335f \ + file://doc/COPYING.LGPL;md5=b8d31f339300bc239d73461d68e77b9c \ + file://tools/attr.c;endline=17;md5=be0403261f0847e5f43ed5b08d19593c \ + file://libattr/libattr.c;endline=17;md5=7970f77049f8fa1199fff62a7ab724fb" + +SRC_URI = "${SAVANNAH_GNU_MIRROR}/attr/${BP}.tar.gz \ + file://run-ptest \ + file://0001-attr.c-Include-libgen.h-for-posix-version-of-basenam.patch \ +" SRC_URI[sha256sum] = "39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87" +inherit ptest update-alternatives autotools gettext + +PACKAGES =+ "lib${BPN}" + +FILES:lib${BPN} = "${libdir}/lib*${SOLIBS} ${sysconfdir}" + +ALTERNATIVE_PRIORITY = "100" +ALTERNATIVE:${PN} = "setfattr getfattr" +ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" +ALTERNATIVE_TARGET[getfattr] = "${bindir}/getfattr" + +PTEST_BUILD_HOST_FILES = "builddefs" +PTEST_BUILD_HOST_PATTERN = "^RPM" + +do_install_ptest() { + cp ${B}/Makefile ${D}${PTEST_PATH} + sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ + -e 's|${DEBUG_PREFIX_MAP}||g' \ + -e 's:${HOSTTOOLS_DIR}/::g' \ + -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ + -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ + -i ${D}${PTEST_PATH}/Makefile + + sed -e "s|^srcdir =.*|srcdir = .|" \ + -e "s|^abs_srcdir =.*|abs_srcdir = .|" \ + -e "s|^abs_top_srcdir =.*|abs_top_srcdir = ..|" \ + -e "s|^Makefile:.*|Makefile:|" \ + -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ + -i ${D}${PTEST_PATH}/Makefile + + cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} + 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 \ + perl-module-constant \ + perl-module-filehandle \ + perl-module-getopt-std \ + perl-module-posix \ + make \ + perl \ + gawk \ + perl-module-cwd \ + perl-module-file-basename \ + perl-module-file-path \ + perl-module-file-spec \ + " + BBCLASSEXTEND = "native nativesdk" From patchwork Mon Mar 24 17:20:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59817 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 800BAC36002 for ; Mon, 24 Mar 2025 17:20:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.45386.1742836814343419189 for ; Mon, 24 Mar 2025 10:20:14 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 31AEE16F3 for ; Mon, 24 Mar 2025 10:20:20 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8F0473F58B for ; Mon, 24 Mar 2025 10:20:13 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] attr: improve ptest packaging Date: Mon, 24 Mar 2025 17:20:07 +0000 Message-ID: <20250324172008.3110176-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250324172008.3110176-1-ross.burton@arm.com> References: <20250324172008.3110176-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Mar 2025 17:20:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213563 As there's just a few test binaries in attr, instead of installing large chunks of the build tree we can install just those and use a boilerplate test runner. Also add a comment explaining why we have to sed the test suite if musl is used. Signed-off-by: Ross Burton --- meta/recipes-support/attr/attr/run-ptest | 34 +++++++++++++++----- meta/recipes-support/attr/attr_2.5.2.bb | 40 +++++++----------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/meta/recipes-support/attr/attr/run-ptest b/meta/recipes-support/attr/attr/run-ptest index 3e7a3a17a04..028671a9bde 100644 --- a/meta/recipes-support/attr/attr/run-ptest +++ b/meta/recipes-support/attr/attr/run-ptest @@ -1,10 +1,30 @@ #!/bin/sh -set +e -make test-suite.log -exitcode=$? -if [ $exitcode -ne 0 -a -e test-suite.log ]; then - cat test-suite.log -fi -exit $exitcode +failed=0 +all=0 +for f in *.test; do + ./run $f + case "$?" in + 0) + echo "PASS: $f" + all=$((all + 1)) + ;; + 77) + echo "SKIP: $f" + ;; + *) + echo "FAIL: $f" + failed=$((failed + 1)) + all=$((all + 1)) + ;; + esac +done + +if [ "$failed" -eq 0 ] ; then + echo "All $all tests passed" + exit 0 +else + echo "$failed of $all tests failed" + exit 1 +fi diff --git a/meta/recipes-support/attr/attr_2.5.2.bb b/meta/recipes-support/attr/attr_2.5.2.bb index b1a20930ed7..390445b959f 100644 --- a/meta/recipes-support/attr/attr_2.5.2.bb +++ b/meta/recipes-support/attr/attr_2.5.2.bb @@ -32,47 +32,29 @@ ALTERNATIVE:${PN} = "setfattr getfattr" ALTERNATIVE_TARGET[setfattr] = "${bindir}/setfattr" ALTERNATIVE_TARGET[getfattr] = "${bindir}/getfattr" -PTEST_BUILD_HOST_FILES = "builddefs" -PTEST_BUILD_HOST_PATTERN = "^RPM" - do_install_ptest() { - cp ${B}/Makefile ${D}${PTEST_PATH} - sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - -i ${D}${PTEST_PATH}/Makefile + install -m755 ${S}/test/run ${S}/test/sort-getfattr-output ${D}${PTEST_PATH}/ - sed -e "s|^srcdir =.*|srcdir = .|" \ - -e "s|^abs_srcdir =.*|abs_srcdir = .|" \ - -e "s|^abs_top_srcdir =.*|abs_top_srcdir = ..|" \ - -e "s|^Makefile:.*|Makefile:|" \ - -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ - -i ${D}${PTEST_PATH}/Makefile - - cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} - cp -rf ${S}/test/ ${D}${PTEST_PATH} + for t in $(makefile-getvar ${S}/test/Makemodule.am TESTS); do + install -m644 ${S}/$t ${D}${PTEST_PATH}/ + done } do_install_ptest:append:libc-musl() { - sed -i -e 's|f: Operation n|f: N|g' ${D}${PTEST_PATH}/test/attr.test + # With glibc strerror(ENOTSUP) is "Operation not supported" but + # musl is "Not supported". + # https://savannah.nongnu.org/bugs/?62370 + sed -i -e 's|f: Operation not supported|f: Not supported|g' ${D}${PTEST_PATH}/attr.test } RDEPENDS:${PN}-ptest = "attr \ - bash \ - coreutils \ - perl-module-constant \ - perl-module-filehandle \ - perl-module-getopt-std \ - perl-module-posix \ - make \ perl \ - gawk \ perl-module-cwd \ perl-module-file-basename \ perl-module-file-path \ - perl-module-file-spec \ + perl-module-filehandle \ + perl-module-getopt-std \ + perl-module-posix \ " BBCLASSEXTEND = "native nativesdk" From patchwork Mon Mar 24 17:20:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 59818 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81E4BC36008 for ; Mon, 24 Mar 2025 17:20:24 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.45387.1742836815015187985 for ; Mon, 24 Mar 2025 10:20:15 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CDB5516F3 for ; Mon, 24 Mar 2025 10:20:20 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 371793F58B for ; Mon, 24 Mar 2025 10:20:14 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] acl: improve ptest packaging Date: Mon, 24 Mar 2025 17:20:08 +0000 Message-ID: <20250324172008.3110176-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250324172008.3110176-1-ross.burton@arm.com> References: <20250324172008.3110176-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 24 Mar 2025 17:20:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/213564 As there's a small number of test binaries in acl, instead of installing large chunks of the build tree we can install just those and use a boilerplate test runner. Drop 0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch and replace with an explicit -DBASEDIR= flag passed at build time. Drop 0001-test-patch-out-failing-bits.patch and delete the tests that fail entirely, as the lines that were being deleted in the patch were the key parts of the test. Backport a patch from upstream so that some tests don't use excessive amounts of memory. Add a patch to disable a single test which makes assumptions about how stdout and stderr interleave when read, which is dependent on the libc implementation. The tests assume glibc and musl behaves different, so instead of deleting the entire test file just remove the single test. Clean up dependencies now that we're not shipping the build system. Signed-off-by: Ross Burton --- ...t_uid-fix-memory-wasting-loop-if-use.patch | 49 +++++++++++++++ .../0001-test-patch-out-failing-bits.patch | 60 ------------------ ...dcode-the-build-path-into-a-helper-l.patch | 24 ------- meta/recipes-support/attr/acl/run-ptest | 37 +++++++---- .../attr/acl/tests-not-musl.patch | 47 ++++++++++++++ meta/recipes-support/attr/acl_2.3.2.bb | 62 +++++++------------ 6 files changed, 145 insertions(+), 134 deletions(-) create mode 100644 meta/recipes-support/attr/acl/0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch delete mode 100644 meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch delete mode 100644 meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch create mode 100644 meta/recipes-support/attr/acl/tests-not-musl.patch diff --git a/meta/recipes-support/attr/acl/0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch b/meta/recipes-support/attr/acl/0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch new file mode 100644 index 00000000000..5052bdaa2f1 --- /dev/null +++ b/meta/recipes-support/attr/acl/0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch @@ -0,0 +1,49 @@ +From 56abe432b65801f31277fb9a3bca0f9e31502315 Mon Sep 17 00:00:00 2001 +From: Matthias Gerstner +Date: Thu, 25 Apr 2024 12:43:49 +0200 +Subject: [PATCH] libmisc: __acl_get_uid(): fix memory wasting loop if user + does not exist + +I noticed that `acl_from_text()` unexpectedly returns ENOMEM for invalid +user names. The reason for this is a missing break statement in the for +loop in `__acl_get_uid()`, which causes the loop to act as if ERANGE was +returned from `getpwnam_r()`, thereby exponentially increasing the +buffer size to (in my case) multiple gigabytes, until `grow_buffer()` +reports ENOMEM, which terminates the `__acl_get_uid()` function. + +This is a pretty costly "no such user" lookup that can disturb a +process's heap memory management, but can also cause a process to fail +e.g. if it is multithreaded and other threads encounter an ENOMEM, +before `__acl_get_uid()` frees the gigantic heap buffer and returns. +The allocated memory isn't actually used. Therefore on Linux it should +not affect other processes by default, due to its overcommit memory +and lazy memory allocation strategy. + +Fix this by properly terminating the for loop on any conditions except +an ERANGE error being reported. The same break statement correctly +exists in `__acl_get_gid()` already. + +Fixes: 3737f00 ("use thread-safe getpwnam_r and getgrnam_r") +Signed-off-by: Andreas Gruenbacher + +Upstream-Status: Backport +Signed-off-by: Ross Burton +--- + libmisc/uid_gid_lookup.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libmisc/uid_gid_lookup.c b/libmisc/uid_gid_lookup.c +index a4f21f6..74baab4 100644 +--- a/libmisc/uid_gid_lookup.c ++++ b/libmisc/uid_gid_lookup.c +@@ -91,6 +91,7 @@ __acl_get_uid(const char *token, uid_t *uid_p) + if (err == ERANGE) + continue; + errno = err ? err : EINVAL; ++ break; + } + free(buffer); + return result ? 0 : -1; +-- +2.43.0 + diff --git a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch b/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch deleted file mode 100644 index 219feaccd07..00000000000 --- a/meta/recipes-support/attr/acl/0001-test-patch-out-failing-bits.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 7dec6fa3b3494a55120402ff1ea3eb96b67138e8 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 15:47:49 +0100 -Subject: [PATCH] test: patch out failing bits - -I have confirmed on the host distro (Ubuntu 18.04) that they -fail as well; upstream probably haven't noticed because the -test is only executed under sudo. - -Upstream-Status: Inappropriate [disabling tests instead of fixing them properly] -Signed-off-by: Alexander Kanavin ---- - test/root/permissions.test | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/test/root/permissions.test b/test/root/permissions.test -index 8f8f825..21e8a95 100644 ---- a/test/root/permissions.test -+++ b/test/root/permissions.test -@@ -50,10 +50,6 @@ User daemon is a member in the owning group, which has only read access. - Verify this. - - $ su daemon -- $ cat f -- > root -- > bin -- - $ echo daemon >> f - >~ .*f: Permission denied$ - -@@ -146,8 +142,6 @@ the owning group, he should still have no write access. - $ setfacl -x g:daemon f - - $ su daemon -- $ echo daemon4 >> f -- >~ .*f: Permission denied$ - - - Change the owning group. The other permissions should now grant user -@@ -158,12 +152,6 @@ daemon write access. - - $ su daemon - $ echo daemon5 >> f -- $ cat f -- > root -- > bin -- > daemon -- > daemon2 -- > daemon5 - - - Verify that permissions in separate matching ACL entries do not -@@ -173,7 +161,6 @@ accumulate. - $ setfacl -m g:bin:r,g:daemon:w f - - $ su daemon -- $ : < f - $ : > f - $ : <> f - >~ .*f: Permission denied$ diff --git a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch b/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch deleted file mode 100644 index 748f37f3e7e..00000000000 --- a/meta/recipes-support/attr/acl/0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 42ae3f8a5e32ba0681ccd1552a203ddad8748a6e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 12 Dec 2019 13:45:52 +0100 -Subject: [PATCH] tests: do not hardcode the build path into a helper library - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - test/Makemodule.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/Makemodule.am b/test/Makemodule.am -index e1d715d..cffe732 100644 ---- a/test/Makemodule.am -+++ b/test/Makemodule.am -@@ -30,7 +30,7 @@ EXTRA_DIST += \ - check_LTLIBRARIES = libtestlookup.la - - libtestlookup_la_SOURCES = test/test_passwd.c test/test_group.c --libtestlookup_la_CFLAGS = -DBASEDIR=\"$(abs_srcdir)\" -+libtestlookup_la_CFLAGS = -DBASEDIR=\"/tmp/acl-ptest\" - libtestlookup_la_LDFLAGS = -rpath $(abs_builddir) - - # Make sure translations don't break tests when matching output. diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest index 3af75c84fea..f28d8c12122 100644 --- a/meta/recipes-support/attr/acl/run-ptest +++ b/meta/recipes-support/attr/acl/run-ptest @@ -1,16 +1,31 @@ #!/bin/sh -# -#This script is used to run acl test suites -#umask 077 +failed=0 +all=0 -mkdir -p /tmp/acl-ptest/test -cp test/test.* /tmp/acl-ptest/test -set +e -make test-suite.log -exitcode=$? -if [ $exitcode -ne 0 -a -e test-suite.log ]; then - cat test-suite.log +for f in *.test; do + LD_PRELOAD=$(pwd)/libtestlookup.so ./run $f + case "$?" in + 0) + echo "PASS: $f" + all=$((all + 1)) + ;; + 77) + echo "SKIP: $f" + ;; + *) + echo "FAIL: $f" + failed=$((failed + 1)) + all=$((all + 1)) + ;; + esac +done + +if [ "$failed" -eq 0 ] ; then + echo "All $all tests passed" + exit 0 +else + echo "$failed of $all tests failed" + exit 1 fi -exit $exitcode diff --git a/meta/recipes-support/attr/acl/tests-not-musl.patch b/meta/recipes-support/attr/acl/tests-not-musl.patch new file mode 100644 index 00000000000..8e2c57fb80a --- /dev/null +++ b/meta/recipes-support/attr/acl/tests-not-musl.patch @@ -0,0 +1,47 @@ +Disable a test which fails under musl as the runner makes assumptions about how +stdout and stderr are interleaved, and musl doesn't behave the same as glibc. + +Underlying issue reported at https://savannah.nongnu.org/bugs/?66944. + +Upstream-Status: Inappropriate [musl-specific] +Signed-off-by: Ross Burton + +diff --git i/test/misc.test w/test/misc.test +index 06b3136..736cfbb 100644 +--- i/test/misc.test ++++ w/test/misc.test +@@ -427,34 +427,6 @@ Now, chmod should change the group_obj entry + + $ rmdir d + +-Dangling symlink test https://savannah.nongnu.org/bugs/?28131 +- +- $ mkdir d +- $ ln -s d/a d/b +- $ getfacl -R d +- > # file: d +- > # owner: %TUSER +- > # group: %TGROUP +- > user::rwx +- > group::rwx +- > other::r-x +- > +- $ setfacl -R -m u:bin:rw d +- $ getfacl -RL d +- > getfacl: d/b: No such file or directory +- > # file: d +- > # owner: %TUSER +- > # group: %TGROUP +- > user::rwx +- > user:bin:rw- +- > group::rwx +- > mask::rwx +- > other::r-x +- > +- $ setfacl -RL -m u:bin:rw d +- > setfacl: d/b: No such file or directory +- $ rm -R d +- + Handle escaped literal backslash followed by numeric username + $ mkdir d + $ touch d/f diff --git a/meta/recipes-support/attr/acl_2.3.2.bb b/meta/recipes-support/attr/acl_2.3.2.bb index dd959a5051b..c56c67dbf59 100644 --- a/meta/recipes-support/attr/acl_2.3.2.bb +++ b/meta/recipes-support/attr/acl_2.3.2.bb @@ -16,10 +16,10 @@ LIC_FILES_CHKSUM = "file://doc/COPYING;md5=c781d70ed2b4d48995b790403217a249 \ DEPENDS = "attr" SRC_URI = "${SAVANNAH_GNU_MIRROR}/acl/${BP}.tar.gz \ + file://0001-libmisc-__acl_get_uid-fix-memory-wasting-loop-if-use.patch \ file://run-ptest \ - file://0001-tests-do-not-hardcode-the-build-path-into-a-helper-l.patch \ - file://0001-test-patch-out-failing-bits.patch \ " +SRC_URI:append:libc-musl = " file://tests-not-musl.patch" SRC_URI[sha256sum] = "5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c" @@ -31,57 +31,41 @@ PACKAGES =+ "lib${BPN}" FILES:lib${BPN} = "${libdir}/lib*${SOLIBS}" -PTEST_BUILD_HOST_FILES = "builddefs" -PTEST_BUILD_HOST_PATTERN = "^RPM" - do_compile_ptest() { - oe_runmake libtestlookup.la + oe_runmake libtestlookup.la libtestlookup_la_CFLAGS=-DBASEDIR=\\\"${PTEST_PATH}\\\" } do_install_ptest() { - cp -rf ${S}/test/ ${D}${PTEST_PATH} - cp -rf ${S}/build-aux/ ${D}${PTEST_PATH} - mkdir -p ${D}${PTEST_PATH}/.libs - cp -rf ${B}/.libs/libtestlookup* ${D}${PTEST_PATH}/.libs - cp ${B}/Makefile ${D}${PTEST_PATH} + install -m755 ${S}/test/run ${S}/test/sort-getfacl-output ${D}${PTEST_PATH}/ + install -m644 ${S}/test/*.acl ${D}${PTEST_PATH}/ - sed -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - -e 's:${RECIPE_SYSROOT_NATIVE}::g' \ - -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \ - -i ${D}${PTEST_PATH}/Makefile + # Install the tests + for t in $(makefile-getvar ${S}/test/Makemodule.am TESTS); do + install -m644 ${S}/$t ${D}${PTEST_PATH}/ + done + # Remove the tests that are expected to fail (they need a NFS server configured) + for t in $(makefile-getvar ${S}/test/Makemodule.am XFAIL_TESTS); do + rm ${D}${PTEST_PATH}/$(basename $t) + done + # These tests skip if they're not root but fail if they're run as root + # (https://savannah.nongnu.org/bugs/index.php?66927) + rm -f ${D}${PTEST_PATH}/getfacl.test ${D}${PTEST_PATH}/permissions.test ${D}${PTEST_PATH}/restore.test ${D}${PTEST_PATH}/setfacl.test - sed -e "s|^srcdir =.*|srcdir = .|" \ - -e "s|^abs_srcdir =.*|abs_srcdir = .|" \ - -e "s|^abs_top_srcdir =.*|abs_top_srcdir = ..|" \ - -e "s|^Makefile:.*|Makefile:|" \ - -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ - -i ${D}${PTEST_PATH}/Makefile - - rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai -} - -do_install_ptest:append:libc-musl() { - sed -i -e '/test\/misc.test/d' ${D}${PTEST_PATH}/Makefile + ${B}/libtool --mode=install install ${B}/libtestlookup.la ${D}${PTEST_PATH}/ + rm -f ${D}${PTEST_PATH}/*.la + install -d ${D}${PTEST_PATH}/test + install -m644 ${S}/test/test.passwd ${S}/test/test.group ${D}${PTEST_PATH}/test } RDEPENDS:${PN}-ptest = "acl \ - bash \ coreutils \ perl \ - perl-module-constant \ - perl-module-filehandle \ - perl-module-getopt-std \ - perl-module-posix \ - shadow \ - make \ - gawk \ - e2fsprogs-mke2fs \ perl-module-cwd \ perl-module-file-basename \ perl-module-file-path \ - perl-module-file-spec \ + perl-module-filehandle \ + perl-module-getopt-std \ + perl-module-posix \ " BBCLASSEXTEND = "native nativesdk"