MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "coreutils: split out coreutils-getlimits"

Browse Source 
This reverts commit 149584beef.

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 <ecordonnier@snap.com>
Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Etienne Cordonnier 2025-06-08 23:00:32 +02:00 committed by Richard Purdie
parent 88dc0474de
commit b44a11c71d
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meta/recipes-core/coreutils/coreutils_9.7.bb
View File

@ -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"