Skip to content

Commit 8185512

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

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

meta/recipes-core/coreutils/coreutils_9.7.bb

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@ RDEPENDS:coreutils:class-target += "${@bb.utils.contains('PACKAGECONFIG', 'singl
7474
# regardless of whether single-binary is in effect.
7575
RPROVIDES:coreutils += "${@bb.utils.contains('PACKAGECONFIG', 'single-binary', 'coreutils-stdbuf', '', d)}"
7676

77-
# put getlimits into coreutils-getlimits, because other ptest packages such as
78-
# findutils-ptest may need this command. Note that getlimits is a noinst_PROGRAM
79-
PACKAGE_BEFORE_PN:class-target += "${PN}-getlimits"
80-
FILES:${PN}-getlimits = "${bindir}/getlimits"
81-
8277
# Deal with a separate builddir failure if src doesn't exist when creating version.c/version.h
8378
do_compile:prepend () {
8479
mkdir -p ${B}/src
@@ -106,9 +101,6 @@ do_install:append() {
106101
# in update-alternatives to fail, therefore use lbracket - the name used
107102
# for the actual source file.
108103
mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${BPN}
109-
110-
# this getlimits noinst_PROGRAM would possibly be needed by other ptest packages
111-
install ${B}/src/getlimits ${D}/${bindir}
112104
}
113105

114106
inherit update-alternatives
@@ -213,6 +205,7 @@ do_install_ptest () {
213205
fi
214206
done
215207

208+
install ${B}/src/getlimits ${D}/${bindir}
216209
# handle multilib
217210
sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest
218211
}
@@ -224,6 +217,7 @@ do_install_ptest:append:libc-musl () {
224217
sed -i -e '/tests\/split\/line-bytes.sh/d' ${D}${PTEST_PATH}/Makefile
225218
}
226219

227-
RDEPENDS:${PN}-ptest += "${PN}-getlimits xz \
220+
RDEPENDS:${PN}-ptest += "xz \
228221
${@bb.utils.contains('PACKAGECONFIG', 'acl', 'acl', '', d)} \
229222
${@bb.utils.contains('PACKAGECONFIG', 'xattr', 'attr', '', d)}"
223+
FILES:${PN}-ptest += "${bindir}/getlimits"

0 commit comments

Comments
 (0)