From: Chen Qi <Qi.Chen@windriver.com>
Date: Thu, 6 Jun 2024 12:20:12 +0000 (+0800)
Subject: coreutils: split out coreutils-getlimits
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7bc06eed72ceb55d2c5342e9130e39bd15c04b9a;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

coreutils: split out coreutils-getlimits

Previously, the noinst_PROGRAM getlimits is put in coreutils-ptest
package in order to execute the ptest. However, this command might
also be needed by other ptest packages. As an example, findutils
4.10.0 ptest pacakge would need this command. So we split it out
into a new package.

Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-core/coreutils/coreutils_9.5.bb b/meta/recipes-core/coreutils/coreutils_9.5.bb
index 9a5f836ebe1..178dadc3c5f 100644
--- a/meta/recipes-core/coreutils/coreutils_9.5.bb
+++ b/meta/recipes-core/coreutils/coreutils_9.5.bb
@@ -76,6 +76,11 @@ 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"
+
 # Let aclocal use the relative path for the m4 file rather than the
 # absolute since coreutils has a lot of m4 files, otherwise there might
 # be an "Argument list too long" error when it is built in a long/deep
@@ -109,6 +114,9 @@ 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
@@ -204,7 +212,6 @@ do_install_ptest () {
 
     # Tweak test d_type-check to use python3 instead of python
     sed -i "1s@.*@#!/usr/bin/python3@" ${D}${PTEST_PATH}/tests/d_type-check
-    install ${B}/src/getlimits ${D}/${bindir}
     
     # handle multilib
     sed -i s:@libdir@:${libdir}:g ${D}${PTEST_PATH}/run-ptest
@@ -216,4 +223,4 @@ do_install_ptest:append:libc-musl () {
     sed -i -e '/tests\/dd\/no-allocate.sh/d' ${D}${PTEST_PATH}/Makefile
     sed -i -e '/tests\/split\/line-bytes.sh/d' ${D}${PTEST_PATH}/Makefile
 }
-FILES:${PN}-ptest += "${bindir}/getlimits"
+RDEPENDS:${PN}-ptest += "${PN}-getlimits"