diff mbox series

[1/3] findutils: remove tabs

Message ID 20250607143512.484259-1-ecordonnier@snap.com
State New
Headers show
Series [1/3] findutils: remove tabs | expand

Commit Message

Etienne Cordonnier June 7, 2025, 2:35 p.m. UTC 
From: Etienne Cordonnier <ecordonnier@snap.com>

Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
---
 meta/recipes-extended/findutils/findutils_4.10.0.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Etienne Cordonnier June 7, 2025, 2:54 p.m. UTC | #1 
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


On Sat, Jun 7, 2025 at 4:35 PM Etienne Cordonnier via lists.openembedded.org
<ecordonnier=snap.com@lists.openembedded.org> wrote:

> From: Etienne Cordonnier <ecordonnier@snap.com>
>
> 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 <ecordonnier@snap.com>
> ---
>  meta/recipes-core/coreutils/coreutils_9.7.bb | 12 +++---------
>  1 file changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-core/coreutils/coreutils_9.7.bb
> b/meta/recipes-core/coreutils/coreutils_9.7.bb
> index 091e1ea2c5..dc9dfae26b 100644
> --- a/meta/recipes-core/coreutils/coreutils_9.7.bb
> +++ b/meta/recipes-core/coreutils/coreutils_9.7.bb
> @@ -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"
> --
> 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: openembedded-core+owner@lists.openembedded.org
> 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=
> [ecordonnier@snap.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Etienne Cordonnier June 7, 2025, 6:18 p.m. UTC | #2 
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

On Sat, Jun 7, 2025 at 4:35 PM Etienne Cordonnier via lists.openembedded.org
<ecordonnier=snap.com@lists.openembedded.org> wrote:

> From: Etienne Cordonnier <ecordonnier@snap.com>
>
> 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.
>
> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
> ---
>  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(-)
>
> 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
>  # 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
> diff --git a/meta/recipes-extended/findutils/findutils_4.10.0.bb
> b/meta/recipes-extended/findutils/findutils_4.10.0.bb
> index 508485bcd3..15dedb3582 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"
>  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: openembedded-core+owner@lists.openembedded.org
> 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=
> [ecordonnier@snap.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Jeroen Hofstee June 7, 2025, 9:09 p.m. UTC | #3 
Hello Etienne,

On 6/7/25 16:35, Etienne Cordonnier via lists.openembedded.org wrote:
> From: Etienne Cordonnier <ecordonnier@snap.com>
>
> Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com>
> ---
>   meta/recipes-extended/findutils/findutils_4.10.0.bb | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-extended/findutils/findutils_4.10.0.bb b/meta/recipes-extended/findutils/findutils_4.10.0.bb
> index 57f77de16f..508485bcd3 100644
> --- a/meta/recipes-extended/findutils/findutils_4.10.0.bb
> +++ b/meta/recipes-extended/findutils/findutils_4.10.0.bb
> @@ -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
>   }
>

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

With kind regards,

Jeroen
diff mbox series

Patch

diff --git a/meta/recipes-extended/findutils/findutils_4.10.0.bb b/meta/recipes-extended/findutils/findutils_4.10.0.bb
index 57f77de16f..508485bcd3 100644
--- a/meta/recipes-extended/findutils/findutils_4.10.0.bb
+++ b/meta/recipes-extended/findutils/findutils_4.10.0.bb
@@ -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
 }