diff options
author | Etienne Cordonnier <ecordonnier@snap.com> | 2025-06-08 23:00:31 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2025-06-12 11:03:43 +0100 |
commit | 88dc0474ded72d33e1a6d7cf6cc5fe04f3a31210 (patch) | |
tree | b85e9921e120379fd07823b39629acfdba77718d | |
parent | 2db3a58bc739ca1f84a8553a327cd397ebe7af66 (diff) | |
download | poky-88dc0474ded72d33e1a6d7cf6cc5fe04f3a31210.tar.gz |
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.
(From OE-Core rev: 4e4149c13adda3dd3b07712b1025ef077dd460b4)
Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-extended/findutils/findutils/run-ptest | 3 | ||||
-rw-r--r-- | meta/recipes-extended/findutils/findutils_4.10.0.bb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-extended/findutils/findutils/run-ptest b/meta/recipes-extended/findutils/findutils/run-ptest index 3dec117067..0c9af47efd 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 | |||
5 | # make oldfind visible | 5 | # make oldfind visible |
6 | export PATH="/tmp:${PATH}" | 6 | export PATH="/tmp:${PATH}" |
7 | 7 | ||
8 | # Add findutils ptest directory to PATH for getlimits | ||
9 | export PATH="/usr/lib/findutils/ptest:${PATH}" | ||
10 | |||
8 | export built_programs="find xargs locate updatedb" | 11 | export built_programs="find xargs locate updatedb" |
9 | 12 | ||
10 | # this gets substituted by sed during build | 13 | # 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 57f77de16f..aa21637657 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" | |||
15 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" | 15 | EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" |
16 | 16 | ||
17 | # need od from coreutils for -t option | 17 | # 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" |
19 | 19 | ||
20 | do_install_ptest:class-target() { | 20 | do_install_ptest:class-target() { |
21 | mkdir -p ${D}${PTEST_PATH}/tests/ | 21 | mkdir -p ${D}${PTEST_PATH}/tests/ |
22 | cp ${S}/init.cfg ${D}${PTEST_PATH} | 22 | cp ${S}/init.cfg ${D}${PTEST_PATH} |
23 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 23 | cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
24 | install -m 755 ${B}/find/getlimits ${D}${PTEST_PATH}/ | ||
24 | 25 | ||
25 | # substitute value in run-ptest with actual version | 26 | # substitute value in run-ptest with actual version |
26 | sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest | 27 | sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest |