Skip to contentSkip to conversation

findutils: remove tabs

PATCH In review [email protected] 2 participants 6 messages Jun 7, 2025 2 messages not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 findutils: remove tabs

From: Etienne Cordonnier <[email protected]>

---
 meta/recipes-extended/findutils/findutils_4.10.0.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-extended/findutils/findutils_4.10.0.bb +5 -5
index 57f77de16f..508485bcd3 100644
@@ -18,10 +18,10 @@ EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
 RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits"
 
 do_install_ptest:class-target() {
-	mkdir -p ${D}${PTEST_PATH}/tests/
-	cp ${S}/init.cfg ${D}${PTEST_PATH}
-	cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
+    mkdir -p ${D}${PTEST_PATH}/tests/
+    cp ${S}/init.cfg ${D}${PTEST_PATH}
+    cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
 
-	# substitute value in run-ptest with actual version
-	sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
+    # substitute value in run-ptest with actual version
+    sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
 }
Signature · 1 line
2.43.0
#1 lore raw

PATCH 2/3 findutils: use getlimits from findutils

From: Etienne Cordonnier <[email protected]>

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.

---
 meta/recipes-extended/findutils/findutils/run-ptest | 3 +++
 meta/recipes-extended/findutils/findutils_4.10.0.bb | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
meta/recipes-extended/findutils/findutils/run-ptest +3 -0
index 3dec117067..0c9af47efd 100644
@@ -5,6 +5,9 @@ ln -s /usr/bin/find /tmp/oldfind
 # make oldfind visible
 export PATH="/tmp:${PATH}"
 
+# Add findutils ptest directory to PATH for getlimits
+export PATH="/usr/lib/findutils/ptest:${PATH}"
+
 export built_programs="find xargs locate updatedb"
 
 # this gets substituted by sed during build
meta/recipes-extended/findutils/findutils_4.10.0.bb +2 -1
index 508485bcd3..15dedb3582 100644
@@ -15,12 +15,13 @@ CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes"
 EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
 
 # need od from coreutils for -t option
-RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits"
+RDEPENDS:${PN}-ptest += "bash sed grep coreutils"
 
 do_install_ptest:class-target() {
     mkdir -p ${D}${PTEST_PATH}/tests/
     cp ${S}/init.cfg ${D}${PTEST_PATH}
     cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
+    install -m 755 ${B}/find/getlimits ${D}${PTEST_PATH}/$
 
     # substitute value in run-ptest with actual version
     sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
Signature · 1 line
2.43.0
#2 lore raw

PATCH 3/3 Revert "coreutils: split out coreutils-getlimits"

In reply to [email protected]

From: Etienne Cordonnier <[email protected]>

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).

---
 meta/recipes-core/coreutils/coreutils_9.7.bb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
meta/recipes-core/coreutils/coreutils_9.7.bb +3 -9
index 091e1ea2c5..dc9dfae26b 100644
@@ -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"
Signature · 1 line
2.43.0

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw

Re: [OE-core] [PATCH 3/3] Revert "coreutils: split out coreutils-getlimits"

Hi Qi Chen,
is this patch OK? Or were there other recipes than findutils which needed coreutils-getlimits? If there are other recipes which need getlimits, I could create a small recipe providing getlimits instead of the patches I sent.

Regards,
Étienne

Quoted 85 lines · Etienne Cordonnier via lists.openembedded.org

From: Etienne Cordonnier <[email protected]>

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).

---
 meta/recipes-core/coreutils/coreutils_9.7.bb | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
meta/recipes-core/coreutils/coreutils_9.7.bb +0 -0
index 091e1ea2c5..dc9dfae26b 100644
@@ -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

meta/recipes-core/coreutils/coreutils_9.7.bb +0 -3
-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
meta/recipes-core/coreutils/coreutils_9.7.bb +0 -0
@@ -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}
meta/recipes-core/coreutils/coreutils_9.7.bb +0 -2
-
-       # this getlimits noinst_PROGRAM would possibly be needed by other

ptest packages

meta/recipes-core/coreutils/coreutils_9.7.bb +2 -2
-       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"
--
2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#218198):
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_218198&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=A9bEAAbvLazUdYd37esvLuMf7rJlZmHAglqENz6xHoWpT5ZGUQJDNRe7hac1mj6M&s=lCxBdFhVad7CRLo0B-qWW7q5CaAp1j3Zv6phlXg3rGs&e=
Mute This Topic:
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_113520662_7048771&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=A9bEAAbvLazUdYd37esvLuMf7rJlZmHAglqENz6xHoWpT5ZGUQJDNRe7hac1mj6M&s=iuhfYUTV70oP7RaX64p8FGjCw_N5WcrvOp_tiPSRIcw&e=
Group Owner: [email protected] Unsubscribe:
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=A9bEAAbvLazUdYd37esvLuMf7rJlZmHAglqENz6xHoWpT5ZGUQJDNRe7hac1mj6M&s=gupniZrbLUmqzKv61gy_aB1AhBaveHZg76FdUopAki8&e=
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

A message that is not in the archive (sent off-list or not yet received): [email protected]

#6 lore raw

Re: [OE-core] [PATCH 2/3] findutils: use getlimits from findutils

Hi,
I've tested the patch and it works fine, however during my rebase a trailing dollar was introduced at the end of this line:
+ install -m 755 ${B}/find/getlimits ${D}${PTEST_PATH}/$

I can resend the patch series if needed, but that's the only change required. Sorry about that.

Étienne

Quoted 67 lines · Etienne Cordonnier via lists.openembedded.org

From: Etienne Cordonnier <[email protected]>

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.

---
 meta/recipes-extended/findutils/findutils/run-ptest | 3 +++
 meta/recipes-extended/findutils/findutils_4.10.0.bb | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
meta/recipes-extended/findutils/findutils/run-ptest +3 -0
index 3dec117067..0c9af47efd 100644
@@ -5,6 +5,9 @@ ln -s /usr/bin/find /tmp/oldfind
 # make oldfind visible
 export PATH="/tmp:${PATH}"
 
+# Add findutils ptest directory to PATH for getlimits
+export PATH="/usr/lib/findutils/ptest:${PATH}"
+
 export built_programs="find xargs locate updatedb"
 
 # this gets substituted by sed during build
meta/recipes-extended/findutils/findutils_4.10.0.bb +2 -2
index 508485bcd3..15dedb3582 100644
@@ -15,12 +15,13 @@ CACHED_CONFIGUREVARS += "gl_cv_func_wcwidth_works=yes"
 EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
 
 # need od from coreutils for -t option
-RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits"
+RDEPENDS:${PN}-ptest += "bash sed grep coreutils"
 
 do_install_ptest:class-target() {
     mkdir -p ${D}${PTEST_PATH}/tests/
     cp ${S}/init.cfg ${D}${PTEST_PATH}
     cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
+    install -m 755 ${B}/find/getlimits ${D}${PTEST_PATH}/$
 
     # substitute value in run-ptest with actual version
     sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
--

2.43.0

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#218197):
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_message_218197&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=-nlFzTZahyvVY_v3eEDMoUCaCqsrG2LPNZeCTKOjTE9-LIxsa-JmXS5mTr_aPQQC&s=DaJW6kfmBfV3mTY4K3CYbtobCTGQDxyhS64FctqtQCE&e=
Mute This Topic:
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_mt_113520661_7048771&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=-nlFzTZahyvVY_v3eEDMoUCaCqsrG2LPNZeCTKOjTE9-LIxsa-JmXS5mTr_aPQQC&s=Hzs1Ld-h7P0Gb3qTL_5nCvzj6_zqxTdAgszG4UNPZ9w&e=
Group Owner: [email protected] Unsubscribe:
https://urldefense.proofpoint.com/v2/url?u=https-3A__lists.openembedded.org_g_openembedded-2Dcore_unsub&d=DwIFaQ&c=ncDTmphkJTvjIDPh0hpF_4vCHvabgGkICC2epckfdiw&r=AhkbNonVuMIGRfPx_Qj9TsRih1DULJTKUkSGa66m67E&m=-nlFzTZahyvVY_v3eEDMoUCaCqsrG2LPNZeCTKOjTE9-LIxsa-JmXS5mTr_aPQQC&s=amzbbfpWZhWf6j4wZ-8C2zz7-uJSxX3W_Ur0sBi6anM&e=
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#7 lore raw
In reply to [email protected]

Hello Etienne,

Quoted 18 lines · Etienne Cordonnier via lists.openembedded.org

From: Etienne Cordonnier <[email protected]>

---
  meta/recipes-extended/findutils/findutils_4.10.0.bb | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)
meta/recipes-extended/findutils/findutils_4.10.0.bb +0 -2
index 57f77de16f..508485bcd3 100644
@@ -18,10 +18,10 @@ EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
  RDEPENDS:${PN}-ptest += "bash sed grep coreutils coreutils-getlimits"
 
  do_install_ptest:class-target() {
-	mkdir -p ${D}${PTEST_PATH}/tests/
-	cp ${S}/init.cfg ${D}${PTEST_PATH}

meta/recipes-extended/findutils/findutils_4.10.0.bb EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" · line 27

Quoted 10 lines
meta/recipes-extended/findutils/findutils_4.10.0.bb +5 -3
-	cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
+    mkdir -p ${D}${PTEST_PATH}/tests/
+    cp ${S}/init.cfg ${D}${PTEST_PATH}
+    cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests/
 
-	# substitute value in run-ptest with actual version
-	sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
+    # substitute value in run-ptest with actual version
+    sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
  }

This is a shell script, they should have tabs in openembedded-core.

With kind regards,

Jeroen