Skip to content

Commit 73df970

Browse files
Ecordonnierrpurdie
authored andcommitted
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 <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>
1 parent 5f6d408 commit 73df970

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

meta/recipes-extended/findutils/findutils/run-ptest

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ ln -s /usr/bin/find /tmp/oldfind
55
# make oldfind visible
66
export PATH="/tmp:${PATH}"
77

8+
# Add findutils ptest directory to PATH for getlimits
9+
export PATH="/usr/lib/findutils/ptest:${PATH}"
10+
811
export built_programs="find xargs locate updatedb"
912

1013
# this gets substituted by sed during build

meta/recipes-extended/findutils/findutils_4.10.0.bb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes"
1515
EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
1616

1717
# need od from coreutils for -t option
18-
RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits"
18+
RDEPENDS:${PN}-ptest += "bash sed grep coreutils"
1919

2020
do_install_ptest:class-target() {
2121
mkdir -p ${D}${PTEST_PATH}/tests/
2222
cp ${S}/init.cfg ${D}${PTEST_PATH}
2323
cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
24+
install -m 755 ${B}/find/getlimits ${D}${PTEST_PATH}/
2425

2526
# substitute value in run-ptest with actual version
2627
sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest

0 commit comments

Comments
 (0)