From b44a11c71d424f5632c256374d9f879104ec2cde Mon Sep 17 00:00:00 2001 From: Etienne Cordonnier Date: Sun, 8 Jun 2025 23:00:32 +0200 Subject: Revert "coreutils: split out coreutils-getlimits" This reverts commit 149584beef1e1b28a4e51f40515204e7edaa9d1f. The coreutils-getlimits package is no longer needed since findutils-ptest now uses its own getlimits implementation. This improves modularity and makes it easier to use alternative coreutils implementations via PREFERRED_PROVIDER (e.g. uutils-coreutils recipe in meta-openembedded). (From OE-Core rev: 2d761482c353df8f0d7f4e56b004113bf351e1df) Signed-off-by: Etienne Cordonnier Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- meta/recipes-core/coreutils/coreutils_9.7.bb | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/meta/recipes-core/coreutils/coreutils_9.7.bb b/meta/recipes-core/coreutils/coreutils_9.7.bb index 091e1ea2c5..dc9dfae26b 100644 --- a/meta/recipes-core/coreutils/coreutils_9.7.bb +++ b/meta/recipes-core/coreutils/coreutils_9.7.bb @@ -74,11 +74,6 @@ RDEPENDS:coreutils:class-target += "${@bb.utils.contains('PACKAGECONFIG', 'singl # regardless of whether single-binary is in effect. RPROVIDES:coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}" -# put getlimits into coreutils-getlimits, because other ptest packages such as -# findutils-ptest may need this command. Note that getlimits is a noinst_PROGRAM -PACKAGE_BEFORE_PN:class-target += "${PN}-getlimits" -FILES:${PN}-getlimits = "${bindir}/getlimits" - # Deal with a separate builddir failure if src doesn't exist when creating version.c/version.h do_compile:prepend () { mkdir -p ${B}/src @@ -106,9 +101,6 @@ do_install:append() { # in update-alternatives to fail, therefore use lbracket - the name used # for the actual source file. mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN} - - # this getlimits noinst_PROGRAM would possibly be needed by other ptest packages - install ${B}/src/getlimits ${D}/${bindir} } inherit update-alternatives @@ -213,6 +205,7 @@ do_install_ptest () { fi done + install ${B}/src/getlimits ${D}/${bindir} # handle multilib sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest } @@ -224,6 +217,7 @@ do_install_ptest:append:libc-musl () { sed -i -e '/tests\/split\/line-bytes.sh/d' ${D}${PTEST_PATH}/Makefile } -RDEPENDS:${PN}-ptest += "${PN}-getlimits xz \ +RDEPENDS:${PN}-ptest += "xz \ ${@bb.utils.contains('PACKAGECONFIG', 'acl', 'acl', '', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'xattr', 'attr', '', d)}" +FILES:${PN}-ptest += "${bindir}/getlimits" -- cgit v1.2.3-54-g00ecf