From: Etienne Cordonnier Date: Sun, 8 Jun 2025 21:00:31 +0000 (+0200) Subject: findutils: use getlimits from findutils X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e4149c13adda3dd3b07712b1025ef077dd460b4;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git findutils: use getlimits from findutils Having findutils depending on coreutils-getlimits makes it harder to replace GNU coreutils with uutils-coreutils using PREFERRED_PROVIDER. Also, the findutils repository contains a version of getlimits used for the tests, so there is no need to depend on coreutils's version of getlimits. Signed-off-by: Etienne Cordonnier Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-extended/findutils/findutils/run-ptest b/meta/recipes-extended/findutils/findutils/run-ptest index 3dec117067c..0c9af47efdb 100644 --- a/meta/recipes-extended/findutils/findutils/run-ptest +++ b/meta/recipes-extended/findutils/findutils/run-ptest @@ -5,6 +5,9 @@ ln -s /usr/bin/find /tmp/oldfind # make oldfind visible export PATH="/tmp:${PATH}" +# Add findutils ptest directory to PATH for getlimits +export PATH="/usr/lib/findutils/ptest:${PATH}" + export built_programs="find xargs locate updatedb" # this gets substituted by sed during build diff --git a/meta/recipes-extended/findutils/findutils_4.10.0.bb b/meta/recipes-extended/findutils/findutils_4.10.0.bb index 57f77de16f6..aa216376572 100644 --- a/meta/recipes-extended/findutils/findutils_4.10.0.bb +++ b/meta/recipes-extended/findutils/findutils_4.10.0.bb @@ -15,12 +15,13 @@ CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes" EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" # need od from coreutils for -t option -RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits" +RDEPENDS:${PN}-ptest += "bash sed grep coreutils" do_install_ptest:class-target() { mkdir -p ${D}${PTEST_PATH}/tests/ cp ${S}/init.cfg ${D}${PTEST_PATH} cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ + install -m 755 ${B}/find/getlimits ${D}${PTEST_PATH}/ # substitute value in run-ptest with actual version sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest