Skip to contentSkip to conversation

coreutils: split out coreutils-getlimits

PATCH In review [email protected] 4 participants 10 messages Jun 6, 2024 – Jun 15, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 coreutils: split out coreutils-getlimits

From: Chen Qi <[email protected]>

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.

---
 meta/recipes-core/coreutils/coreutils_9.5.bb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
meta/recipes-core/coreutils/coreutils_9.5.bb +9 -2
index 9a5f836ebe..178dadc3c5 100644
@@ -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"
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 findutils: upgrade from 4.9.0 to 4.10.0

From: Chen Qi <[email protected]>

autoconf-2.73.patch is dropped as it's not needed any more.

The run-ptest script is fixed. Instead copying function definitions from init.cfg file, we should just install init.cfg file in the ptest package. The coreutils-getlimits is added as a runtime dependency of the ptest package because the getlimits command is needed.

---
 meta/recipes-extended/findutils/findutils.inc |  1 -
 .../findutils/findutils/autoconf-2.73.patch   | 24 ----------------
 .../findutils/findutils/run-ptest             | 28 -------------------
 ...findutils_4.9.0.bb => findutils_4.10.0.bb} |  6 ++--
 4 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
 rename meta/recipes-extended/findutils/{findutils_4.9.0.bb => findutils_4.10.0.bb} (78%)
meta/recipes-extended/findutils/findutils.inc +0 -1
index 03cf2a8d72..ddcc05750b 100644
@@ -7,7 +7,6 @@ BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
 SECTION = "console/utils"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
-          file://autoconf-2.73.patch \
           file://run-ptest \
           "
 
meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -24
deleted file mode 100644
index 63728b5f91..0000000000
@@ -1,24 +0,0 @@
-The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
-than the full code:
-
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
-
-Just tweak the exiting code to work with 2.73. The next findutils upgrade should
-update to new gnulib
-
-Upstream-Status: Inappropriate
-Signed-off-by: Richard Purdie <[email protected]>
-
-Index: findutils-4.9.0/gl/m4/largefile.m4
-===================================================================
---- findutils-4.9.0.orig/gl/m4/largefile.m4
-+++ findutils-4.9.0/gl/m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [
- 
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # -------------------------------
meta/recipes-extended/findutils/findutils/run-ptest +0 -28
index ec71583c51..3dec117067 100644
@@ -10,34 +10,6 @@ export built_programs="find xargs locate updatedb"
 # this gets substituted by sed during build
 export VERSION="__run_ptest_version__"
 
-# define missing functions for tests/init.sh
-fu_path_prepend_ () {
-	path_prepend_ $@
-}
-
-print_ver_ () {
-	:
-}
-
-skip_if_root_ () {
-	[ $(id -u) = 0 ] && exit 77;
-}
-
-require_root_ () {
-	[ $(id -u) = 0 ] || exit 77;
-}
-
-expensive_ () {
-	:
-}
-
-export -f fu_path_prepend_
-export -f print_ver_
-export -f skip_if_root_
-export -f require_root_
-export -f expensive_
-
-
 for f in tests/*/*.sh; do
 	bash $f ;
 	case $? in
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +3 -3
similarity index 78%
rename from meta/recipes-extended/findutils/findutils_4.9.0.bb
rename to meta/recipes-extended/findutils/findutils_4.10.0.bb
index 074817df27..57f77de16f 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 DEPENDS = "bison-native"
 
-SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe"
+SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5"
 
 PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
 # http://savannah.gnu.org/bugs/?27299
@@ -15,13 +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"
+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/
 
 	# 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.34.1
#2 lore raw

Re: [OE-core][PATCH 2/2] findutils: upgrade from 4.9.0 to 4.10.0

This fails ptests with qemux86_64/musl

bitbake core-image-ptest-findutils
results in

-find: invalid user name or UID argument to -user: '4294967296' +find: invalid user name or UID argument to -user: ‘4294967296’

err renamed from exp +1 -1
@@ -1 +1 @@
-find: invalid group name or GID argument to -group: '4294967296'
+find: invalid group name or GID argument to -group: ‘4294967296’

FAIL: tests/find/user-group-max.sh

Quoted 145 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

autoconf-2.73.patch is dropped as it's not needed any more.

The run-ptest script is fixed. Instead copying function definitions from init.cfg file, we should just install init.cfg file in the ptest package. The coreutils-getlimits is added as a runtime dependency of the ptest package because the getlimits command is needed.

---
 meta/recipes-extended/findutils/findutils.inc |  1 -
 .../findutils/findutils/autoconf-2.73.patch   | 24 ----------------
 .../findutils/findutils/run-ptest             | 28 -------------------
 ...findutils_4.9.0.bb => findutils_4.10.0.bb} |  6 ++--
 4 files changed, 3 insertions(+), 56 deletions(-)
 delete mode 100644 meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
 rename meta/recipes-extended/findutils/{findutils_4.9.0.bb => findutils_4.10.0.bb} (78%)
meta/recipes-extended/findutils/findutils.inc +0 -1
index 03cf2a8d72..ddcc05750b 100644
@@ -7,7 +7,6 @@ BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
 SECTION = "console/utils"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
-          file://autoconf-2.73.patch \
           file://run-ptest \
           "
 
meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -24
deleted file mode 100644
index 63728b5f91..0000000000
@@ -1,24 +0,0 @@
-The gnulib largefile macro needs updating to work with autoconf 2.73. Rather
-than the full code:
-
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?id=f91f633858cf132e50924224c50d6264a92caabb
-
-Just tweak the exiting code to work with 2.73. The next findutils upgrade should
-update to new gnulib
-
-Upstream-Status: Inappropriate
-Signed-off-by: Richard Purdie <[email protected]>
-
-Index: findutils-4.9.0/gl/m4/largefile.m4
-===================================================================
---- findutils-4.9.0.orig/gl/m4/largefile.m4
-+++ findutils-4.9.0/gl/m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [
-
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # -------------------------------
meta/recipes-extended/findutils/findutils/run-ptest +0 -28
index ec71583c51..3dec117067 100644
@@ -10,34 +10,6 @@ export built_programs="find xargs locate updatedb"
 # this gets substituted by sed during build
 export VERSION="__run_ptest_version__"
 
-# define missing functions for tests/init.sh
-fu_path_prepend_ () {
-       path_prepend_ $@
-}
-
-print_ver_ () {
-       :
-}
-
-skip_if_root_ () {
-       [ $(id -u) = 0 ] && exit 77;
-}
-
-require_root_ () {
-       [ $(id -u) = 0 ] || exit 77;
-}
-
-expensive_ () {
-       :
-}
-
-export -f fu_path_prepend_
-export -f print_ver_
-export -f skip_if_root_
-export -f require_root_
-export -f expensive_
-
-
 for f in tests/*/*.sh; do
        bash $f ;
        case $? in
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +3 -4
similarity index 78%
rename from meta/recipes-extended/findutils/findutils_4.9.0.bb
rename to meta/recipes-extended/findutils/findutils_4.10.0.bb
index 074817df27..57f77de16f 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 DEPENDS = "bison-native"
 
-SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe"
+SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5"
 
 PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
 # http://savannah.gnu.org/bugs/?27299
@@ -15,13 +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"
+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/
 
        # substitute value in run-ptest with actual version
        sed -i -e 's/__run_ptest_version__/${PV}/' ${D}${PTEST_PATH}/run-ptest
-
 }
--

2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#200399): https://lists.openembedded.org/g/openembedded-core/message/200399
Mute This Topic: https://lists.openembedded.org/mt/106521747/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

author
#3 lore raw

RE: [OE-core][PATCH 2/2] findutils: upgrade from 4.9.0 to 4.10.0

I just checked. The problem could not be reproduced on my side. Commands and output are as below:

root@qemux86-64:/usr/lib/findutils/ptest# grep FAIL log
root@qemux86-64:/usr/lib/findutils/ptest# grep PASS log
PASS: tests/find/arg-nan.sh
PASS: tests/find/debug-missing-arg.sh
PASS: tests/find/exec-plus-last-file.sh
PASS: tests/find/execdir-fd-leak.sh
PASS: tests/find/files0-from.sh
PASS: tests/find/name-lbracket-literal.sh
PASS: tests/find/name-slash.sh
PASS: tests/find/newer.sh
PASS: tests/find/opt-numeric-arg.sh
PASS: tests/find/printf_escape_c.sh
PASS: tests/find/printf_escapechars.sh
PASS: tests/find/printf_inode.sh
PASS: tests/find/refuse-noop.sh
PASS: tests/find/type_list.sh
PASS: tests/find/used.sh
PASS: tests/find/user-group-max.sh
PASS: tests/misc/help-version.sh
PASS: tests/xargs/conflicting_opts.sh
PASS: tests/xargs/verbose-quote.sh
root@qemux86-64:/usr/lib/findutils/ptest# rpm
rpm        rpmbuild   rpmgraph   rpmlua     rpmsign    rpmspec
rpm2cpio   rpmdb      rpmkeys    rpmquery   rpmsort    rpmverify
root@qemux86-64:/usr/lib/findutils/ptest# rpm -qa | grep musl
musl-1.2.4+git0+79bdacff83-r0.core2_64

Regards,
Qi

-----Original Message-----
From: Khem Raj <[email protected]>
Sent: Saturday, June 15, 2024 6:57 AM
To: Chen, Qi <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH 2/2] findutils: upgrade from 4.9.0 to 4.10.0

This fails ptests with qemux86_64/musl

bitbake core-image-ptest-findutils
results in

-find: invalid user name or UID argument to -user: '4294967296' +find: invalid user name or UID argument to -user: ‘4294967296’

err renamed from exp +1 -1
@@ -1 +1 @@
-find: invalid group name or GID argument to -group: '4294967296'
+find: invalid group name or GID argument to -group: ‘4294967296’

FAIL: tests/find/user-group-max.sh

Quoted 155 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

autoconf-2.73.patch is dropped as it's not needed any more.

The run-ptest script is fixed. Instead copying function definitions from init.cfg file, we should just install init.cfg file in the ptest package. The coreutils-getlimits is added as a runtime dependency of the ptest package because the getlimits command is needed.

---
 meta/recipes-extended/findutils/findutils.inc |  1 -
 .../findutils/findutils/autoconf-2.73.patch   | 24 ----------------
 .../findutils/findutils/run-ptest             | 28 -------------------
 ...findutils_4.9.0.bb => findutils_4.10.0.bb} |  6 ++--
 4 files changed, 3 insertions(+), 56 deletions(-)  delete mode 100644 
meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
 rename meta/recipes-extended/findutils/{findutils_4.9.0.bb => 

findutils_4.10.0.bb} (78%)

meta/recipes-extended/findutils/findutils.inc +0 -1
index 03cf2a8d72..ddcc05750b 100644
@@ -7,7 +7,6 @@ BUGTRACKER = "http://savannah.gnu.org/bugs/?group=findutils"
 SECTION = "console/utils"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
-          file://autoconf-2.73.patch \
           file://run-ptest \
           "
 
(quoted diff) +0 -0

a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted file mode 100644
index 63728b5f91..0000000000

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -1
@@ -1,24 +0,0 @@
-The gnulib largefile macro needs updating to work with autoconf 2.73. 

Rather -than the full code:

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -2
-
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?i

d=f91f633858cf132e50924224c50d6264a92caabb

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -2
-
-Just tweak the exiting code to work with 2.73. The next findutils 

upgrade should -update to new gnulib

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -11
-
-Upstream-Status: Inappropriate
-Signed-off-by: Richard Purdie <[email protected]>
-
-Index: findutils-4.9.0/gl/m4/largefile.m4
-===================================================================
---- findutils-4.9.0.orig/gl/m4/largefile.m4
-+++ findutils-4.9.0/gl/m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 

10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -3
-
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # -------------------------------
meta/recipes-extended/findutils/findutils/run-ptest +0 -0
index ec71583c51..3dec117067 100644
@@ -10,34 +10,6 @@ export built_programs="find xargs locate updatedb"
 # this gets substituted by sed during build  export 

VERSION="__run_ptest_version__"

meta/recipes-extended/findutils/findutils/run-ptest +0 -27
-# define missing functions for tests/init.sh -fu_path_prepend_ () {
-       path_prepend_ $@
-}
-
-print_ver_ () {
-       :
-}
-
-skip_if_root_ () {
-       [ $(id -u) = 0 ] && exit 77;
-}
-
-require_root_ () {
-       [ $(id -u) = 0 ] || exit 77;
-}
-
-expensive_ () {
-       :
-}
-
-export -f fu_path_prepend_
-export -f print_ver_
-export -f skip_if_root_
-export -f require_root_
-export -f expensive_
-
-
 for f in tests/*/*.sh; do
        bash $f ;
        case $? in
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +1 -1
similarity index 78%
rename from meta/recipes-extended/findutils/findutils_4.9.0.bb
rename to meta/recipes-extended/findutils/findutils_4.10.0.bb
index 074817df27..57f77de16f 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
 
 DEPENDS = "bison-native"
 
-SRC_URI[sha256sum] = "a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe"
+SRC_URI[sha256sum] = "1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5"
 
 PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
 # http://savannah.gnu.org/bugs/?27299
@@ -15,13 +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"

meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +2 -0
+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/
 
        # substitute value in run-ptest with actual version
        sed -i -e 's/__run_ptest_version__/${PV}/' 

${D}${PTEST_PATH}/run-ptest
-
}
--
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#200399):
https://lists.openembedded.org/g/openembedded-core/message/200399
Mute This Topic: https://lists.openembedded.org/mt/106521747/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#4 lore raw

Re: [OE-core][PATCH 2/2] findutils: upgrade from 4.9.0 to 4.10.0

Quoted 21 lines · Qi

I just checked. The problem could not be reproduced on my side. Commands and output are as below:

root@qemux86-64:/usr/lib/findutils/ptest# grep FAIL log
root@qemux86-64:/usr/lib/findutils/ptest# grep PASS log
PASS: tests/find/arg-nan.sh
PASS: tests/find/debug-missing-arg.sh
PASS: tests/find/exec-plus-last-file.sh
PASS: tests/find/execdir-fd-leak.sh
PASS: tests/find/files0-from.sh
PASS: tests/find/name-lbracket-literal.sh
PASS: tests/find/name-slash.sh
PASS: tests/find/newer.sh
PASS: tests/find/opt-numeric-arg.sh
PASS: tests/find/printf_escape_c.sh
PASS: tests/find/printf_escapechars.sh
PASS: tests/find/printf_inode.sh
PASS: tests/find/refuse-noop.sh
PASS: tests/find/type_list.sh
PASS: tests/find/used.sh
PASS: tests/find/user-group-max.sh
Quoted 9 lines
PASS: tests/misc/help-version.sh
PASS: tests/xargs/conflicting_opts.sh
PASS: tests/xargs/verbose-quote.sh
root@qemux86-64:/usr/lib/findutils/ptest# rpm
rpm        rpmbuild   rpmgraph   rpmlua     rpmsign    rpmspec
rpm2cpio   rpmdb      rpmkeys    rpmquery   rpmsort    rpmverify
root@qemux86-64:/usr/lib/findutils/ptest# rpm -qa | grep musl
musl-1.2.4+git0+79bdacff83-r0.core2_64

I have musl updated staged in contrib/yoe/mut I wonder if it’s seen with newer musl I also use clang and libc++ so could be that too

Quoted 189 lines

Regards,
Qi

-----Original Message-----
From: Khem Raj <[email protected]>
Sent: Saturday, June 15, 2024 6:57 AM
To: Chen, Qi <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH 2/2] findutils: upgrade from 4.9.0 to 4.10.0

This fails ptests with qemux86_64/musl

bitbake core-image-ptest-findutils
results in

(quoted diff) +1 -1
-find: invalid user name or UID argument to -user: '4294967296'
+find: invalid user name or UID argument to -user: ‘4294967296’
err renamed from exp +1 -1
@@ -1 +1 @@
-find: invalid group name or GID argument to -group: '4294967296'
+find: invalid group name or GID argument to -group: ‘4294967296’

FAIL: tests/find/user-group-max.sh

meta/recipes-extended/findutils/findutils.inc BUGTRACKER = "

Quoted 27 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

autoconf-2.73.patch is dropped as it's not needed any more.

The run-ptest script is fixed. Instead copying function definitions from init.cfg file, we should just install init.cfg file in the ptest package. The coreutils-getlimits is added as a runtime dependency of the ptest package because the getlimits command is needed.

---
 meta/recipes-extended/findutils/findutils.inc |  1 -
 .../findutils/findutils/autoconf-2.73.patch   | 24 ----------------
 .../findutils/findutils/run-ptest             | 28 -------------------
 ...findutils_4.9.0.bb => findutils_4.10.0.bb} |  6 ++--
 4 files changed, 3 insertions(+), 56 deletions(-)  delete mode 100644
meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
 rename meta/recipes-extended/findutils/{findutils_4.9.0.bb =>

findutils_4.10.0.bb} (78%)

meta/recipes-extended/findutils/findutils.inc +0 -0
index 03cf2a8d72..ddcc05750b 100644
@@ -7,7 +7,6 @@ BUGTRACKER = "

http://savannah.gnu.org/bugs/?group=findutils"

meta/recipes-extended/findutils/findutils_4.10.0.bb LIC_FILES_CHKSUM =

Quoted 89 lines
meta/recipes-extended/findutils/findutils.inc +0 -1
 SECTION = "console/utils"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
-          file://autoconf-2.73.patch \
           file://run-ptest \
           "
 

diff --git a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted file mode 100644
index 63728b5f91..0000000000

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -1
@@ -1,24 +0,0 @@
-The gnulib largefile macro needs updating to work with autoconf 2.73.

Rather -than the full code:

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -2
-
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?i

d=f91f633858cf132e50924224c50d6264a92caabb

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -2
-
-Just tweak the exiting code to work with 2.73. The next findutils

upgrade should -update to new gnulib

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -11
-
-Upstream-Status: Inappropriate
-Signed-off-by: Richard Purdie <[email protected]>
-
-Index: findutils-4.9.0/gl/m4/largefile.m4
-===================================================================
---- findutils-4.9.0.orig/gl/m4/largefile.m4
-+++ findutils-4.9.0/gl/m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X

10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -3
-
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # -------------------------------
meta/recipes-extended/findutils/findutils/run-ptest +0 -0
index ec71583c51..3dec117067 100644
@@ -10,34 +10,6 @@ export built_programs="find xargs locate updatedb"
 # this gets substituted by sed during build  export

VERSION="__run_ptest_version__"

meta/recipes-extended/findutils/findutils/run-ptest +0 -27
-# define missing functions for tests/init.sh -fu_path_prepend_ () {
-       path_prepend_ $@
-}
-
-print_ver_ () {
-       :
-}
-
-skip_if_root_ () {
-       [ $(id -u) = 0 ] && exit 77;
-}
-
-require_root_ () {
-       [ $(id -u) = 0 ] || exit 77;
-}
-
-expensive_ () {
-       :
-}
-
-export -f fu_path_prepend_
-export -f print_ver_
-export -f skip_if_root_
-export -f require_root_
-export -f expensive_
-
-
 for f in tests/*/*.sh; do
        bash $f ;
        case $? in
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +0 -0
similarity index 78%
rename from meta/recipes-extended/findutils/findutils_4.9.0.bb
rename to meta/recipes-extended/findutils/findutils_4.10.0.bb
index 074817df27..57f77de16f 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"

meta/recipes-extended/findutils/findutils_4.10.0.bb LIC_FILES_CHKSUM = · line 8

Quoted 4 lines
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +0 -1
 DEPENDS = "bison-native"
 
-SRC_URI[sha256sum] =

"a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe"

meta/recipes-extended/findutils/findutils_4.10.0.bb LIC_FILES_CHKSUM = · line 8

Quoted 1 line
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +1 -0
+SRC_URI[sha256sum] =

"1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5"

meta/recipes-extended/findutils/findutils_4.10.0.bb CACHED_CONFIGUREVARS +=

Quoted 4 lines
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +0 -0
 PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
 # http://savannah.gnu.org/bugs/?27299
@@ -15,13 +15,13 @@ CACHED_CONFIGUREVARS +=

"gl_cv_func_wcwidth_works=yes"

Quoted 30 lines
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +0 -0
 EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
 
 # need od from coreutils for -t option -RDEPENDS:${PN}-ptest += "bash

sed grep coreutils"

meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +2 -0
+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/
 
        # substitute value in run-ptest with actual version
        sed -i -e 's/__run_ptest_version__/${PV}/'

${D}${PTEST_PATH}/run-ptest
-
}
--
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#200399):
https://lists.openembedded.org/g/openembedded-core/message/200399
Mute This Topic: https://lists.openembedded.org/mt/106521747/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#5 lore raw

Re: [OE-core][PATCH 2/2] findutils: upgrade from 4.9.0 to 4.10.0

Note that reporting this does not mean Chen has to reproduce or fix it. And you Khem should make it clear in your report.

Ptests are expected to pass only in the standard glibc/gcc configuration
that the autobuilder tests.

Alex

Quoted 231 lines · Khem Raj via lists.openembedded.org
Quoted 21 lines · Qi

I just checked. The problem could not be reproduced on my side. Commands and output are as below:

root@qemux86-64:/usr/lib/findutils/ptest# grep FAIL log
root@qemux86-64:/usr/lib/findutils/ptest# grep PASS log
PASS: tests/find/arg-nan.sh
PASS: tests/find/debug-missing-arg.sh
PASS: tests/find/exec-plus-last-file.sh
PASS: tests/find/execdir-fd-leak.sh
PASS: tests/find/files0-from.sh
PASS: tests/find/name-lbracket-literal.sh
PASS: tests/find/name-slash.sh
PASS: tests/find/newer.sh
PASS: tests/find/opt-numeric-arg.sh
PASS: tests/find/printf_escape_c.sh
PASS: tests/find/printf_escapechars.sh
PASS: tests/find/printf_inode.sh
PASS: tests/find/refuse-noop.sh
PASS: tests/find/type_list.sh
PASS: tests/find/used.sh
PASS: tests/find/user-group-max.sh
Quoted 9 lines
PASS: tests/misc/help-version.sh
PASS: tests/xargs/conflicting_opts.sh
PASS: tests/xargs/verbose-quote.sh
root@qemux86-64:/usr/lib/findutils/ptest# rpm
rpm        rpmbuild   rpmgraph   rpmlua     rpmsign    rpmspec
rpm2cpio   rpmdb      rpmkeys    rpmquery   rpmsort    rpmverify
root@qemux86-64:/usr/lib/findutils/ptest# rpm -qa | grep musl
musl-1.2.4+git0+79bdacff83-r0.core2_64

I have musl updated staged in contrib/yoe/mut I wonder if it’s seen with newer musl I also use clang and libc++ so could be that too

Quoted 169 lines

Regards,
Qi

-----Original Message-----
From: Khem Raj <[email protected]>
Sent: Saturday, June 15, 2024 6:57 AM
To: Chen, Qi <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH 2/2] findutils: upgrade from 4.9.0 to 4.10.0

This fails ptests with qemux86_64/musl

bitbake core-image-ptest-findutils
results in

(quoted diff) +1 -1
-find: invalid user name or UID argument to -user: '4294967296'
+find: invalid user name or UID argument to -user: ‘4294967296’
err renamed from exp +1 -1
@@ -1 +1 @@
-find: invalid group name or GID argument to -group: '4294967296'
+find: invalid group name or GID argument to -group: ‘4294967296’

FAIL: tests/find/user-group-max.sh

meta/recipes-extended/findutils/findutils.inc BUGTRACKER = "

Quoted 27 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

autoconf-2.73.patch is dropped as it's not needed any more.

The run-ptest script is fixed. Instead copying function definitions from init.cfg file, we should just install init.cfg file in the ptest package. The coreutils-getlimits is added as a runtime dependency of the ptest package because the getlimits command is needed.

---
 meta/recipes-extended/findutils/findutils.inc |  1 -
 .../findutils/findutils/autoconf-2.73.patch   | 24 ----------------
 .../findutils/findutils/run-ptest             | 28 -------------------
 ...findutils_4.9.0.bb => findutils_4.10.0.bb} |  6 ++--
 4 files changed, 3 insertions(+), 56 deletions(-)  delete mode 100644
meta/recipes-extended/findutils/findutils/autoconf-2.73.patch
 rename meta/recipes-extended/findutils/{findutils_4.9.0.bb =>

findutils_4.10.0.bb} (78%)

meta/recipes-extended/findutils/findutils.inc +0 -0
index 03cf2a8d72..ddcc05750b 100644
@@ -7,7 +7,6 @@ BUGTRACKER = "

http://savannah.gnu.org/bugs/?group=findutils"

meta/recipes-extended/findutils/findutils_4.10.0.bb LIC_FILES_CHKSUM =

Quoted 89 lines
meta/recipes-extended/findutils/findutils.inc +0 -1
 SECTION = "console/utils"
 
 SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.xz \
-          file://autoconf-2.73.patch \
           file://run-ptest \
           "
 

diff --git a/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch b/meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted file mode 100644
index 63728b5f91..0000000000

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -1
@@ -1,24 +0,0 @@
-The gnulib largefile macro needs updating to work with autoconf 2.73.

Rather -than the full code:

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -2
-
-https://git.savannah.gnu.org/cgit/gnulib.git/commit/m4/largefile.m4?i

d=f91f633858cf132e50924224c50d6264a92caabb

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -2
-
-Just tweak the exiting code to work with 2.73. The next findutils

upgrade should -update to new gnulib

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -11
-
-Upstream-Status: Inappropriate
-Signed-off-by: Richard Purdie <[email protected]>
-
-Index: findutils-4.9.0/gl/m4/largefile.m4
-===================================================================
---- findutils-4.9.0.orig/gl/m4/largefile.m4
-+++ findutils-4.9.0/gl/m4/largefile.m4
-@@ -26,7 +26,7 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
- # with _TIME_BITS.  Also, work around a problem in autoconf <= 2.69:
- # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X

10.5,
- # or configures them incorrectly in some cases.
--m4_version_prereq([2.70], [], [
-+m4_version_prereq([2.73], [], [

meta/recipes-extended/findutils/findutils/autoconf-2.73.patch deleted +0 -3
-
- # _AC_SYS_LARGEFILE_TEST_INCLUDES
- # -------------------------------
meta/recipes-extended/findutils/findutils/run-ptest +0 -0
index ec71583c51..3dec117067 100644
@@ -10,34 +10,6 @@ export built_programs="find xargs locate updatedb"
 # this gets substituted by sed during build  export

VERSION="__run_ptest_version__"

meta/recipes-extended/findutils/findutils/run-ptest +0 -27
-# define missing functions for tests/init.sh -fu_path_prepend_ () {
-       path_prepend_ $@
-}
-
-print_ver_ () {
-       :
-}
-
-skip_if_root_ () {
-       [ $(id -u) = 0 ] && exit 77;
-}
-
-require_root_ () {
-       [ $(id -u) = 0 ] || exit 77;
-}
-
-expensive_ () {
-       :
-}
-
-export -f fu_path_prepend_
-export -f print_ver_
-export -f skip_if_root_
-export -f require_root_
-export -f expensive_
-
-
 for f in tests/*/*.sh; do
        bash $f ;
        case $? in
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +0 -0
similarity index 78%
rename from meta/recipes-extended/findutils/findutils_4.9.0.bb
rename to meta/recipes-extended/findutils/findutils_4.10.0.bb
index 074817df27..57f77de16f 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =

"file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"

meta/recipes-extended/findutils/findutils_4.10.0.bb LIC_FILES_CHKSUM = · line 8

Quoted 4 lines
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +0 -1
 DEPENDS = "bison-native"
 
-SRC_URI[sha256sum] =

"a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe"

meta/recipes-extended/findutils/findutils_4.10.0.bb LIC_FILES_CHKSUM = · line 8

Quoted 1 line
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +1 -0
+SRC_URI[sha256sum] =

"1387e0b67ff247d2abde998f90dfbf70c1491391a59ddfecb8ae698789f0a4f5"

meta/recipes-extended/findutils/findutils_4.10.0.bb CACHED_CONFIGUREVARS +=

Quoted 4 lines
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +0 -0
 PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux"
 # http://savannah.gnu.org/bugs/?27299
@@ -15,13 +15,13 @@ CACHED_CONFIGUREVARS +=

"gl_cv_func_wcwidth_works=yes"

Quoted 11 lines
meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +0 -0
 EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
 
 # need od from coreutils for -t option -RDEPENDS:${PN}-ptest += "bash

sed grep coreutils"

meta/recipes-extended/findutils/findutils_4.10.0.bb renamed from meta/recipes-extended/findutils/findutils_4.9.0.bb +2 -0
+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/
Quoted 12 lines
Quoted 11 lines
        # substitute value in run-ptest with actual version
        sed -i -e 's/__run_ptest_version__/${PV}/'
${D}${PTEST_PATH}/run-ptest
-
 }
--
2.34.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#200665):
https://lists.openembedded.org/g/openembedded-core/message/200665
Mute This Topic: https://lists.openembedded.org/mt/106521747/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ [email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#6 lore raw
In reply to [email protected]
Quoted 8 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

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.

Why would we not just put this in the main coreutils package? What’s so special about getlimits that it needs a standalone package?

Ross

author
#7 lore raw

Because unlike other commands, getlimits is a noinst_PROGRAM. It's expected to be used by its tests only. I checked Ubuntu, Debian and Fedora, none of them provides getlimits. So if not for the ptest packages, we would not be using this command either.

Regards,
Qi

-----Original Message-----
From: Ross Burton <[email protected]>
Sent: Friday, June 7, 2024 9:34 PM
To: Chen, Qi <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH 1/2] coreutils: split out coreutils-getlimits

Quoted 8 lines · Chen Qi via lists.openembedded.org

From: Chen Qi <[email protected]>

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.

Why would we not just put this in the main coreutils package? What’s so special about getlimits that it needs a standalone package?

Ross

#8 lore raw
Quoted 2 lines · Chen Qi via lists.openembedded.org

Because unlike other commands, getlimits is a noinst_PROGRAM. It's expected to be used by its tests only. I checked Ubuntu, Debian and Fedora, none of them provides getlimits. So if not for the ptest packages, we would not be using this command either.

So if nobody installs it, how does anyone else run the findutils test suite?

Ross

author
#9 lore raw

For OE, the finduitls package before 4.10.0 does not require getlimits to run its ptest. But for the new 4.10.0 version, its test cases need getlimits.

For other distros, I'm not sure if they have similar mechanisms like ptest and I'm not sure if they have met this problem. I just checked debian:latest and its finduitls package is of version 4.9.0. So chances are that they haven't met this problem or that their build system will not reveal such problem to them.

Regards,
Qi

-----Original Message-----
From: Ross Burton <[email protected]>
Sent: Friday, June 7, 2024 10:46 PM
To: Chen, Qi <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH 1/2] coreutils: split out coreutils-getlimits

Quoted 2 lines · Chen Qi via lists.openembedded.org

Because unlike other commands, getlimits is a noinst_PROGRAM. It's expected to be used by its tests only. I checked Ubuntu, Debian and Fedora, none of them provides getlimits. So if not for the ptest packages, we would not be using this command either.

So if nobody installs it, how does anyone else run the findutils test suite?

Ross