public inbox for openembedded-core@lists.openembedded.org
 help / color / mirror / Atom feed
* [PATCH 1/2] procps: upgrade from 4.0.5 to 4.0.6
@ 2026-02-24  1:47 Changqing Li
  2026-02-24  1:47 ` [PATCH 2/2] procps: support ptest when TCLIBC is glibc Changqing Li
  0 siblings, 1 reply; 8+ messages in thread
From: Changqing Li @ 2026-02-24  1:47 UTC (permalink / raw)
  To: openembedded-core

Remove patch top_large_pid_fix.patch, already in 4.0.6

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 .../procps/procps/top_large_pid_fix.patch     | 52 -------------------
 .../{procps_4.0.5.bb => procps_4.0.6.bb}      |  3 +-
 2 files changed, 1 insertion(+), 54 deletions(-)
 delete mode 100644 meta/recipes-extended/procps/procps/top_large_pid_fix.patch
 rename meta/recipes-extended/procps/{procps_4.0.5.bb => procps_4.0.6.bb} (97%)

diff --git a/meta/recipes-extended/procps/procps/top_large_pid_fix.patch b/meta/recipes-extended/procps/procps/top_large_pid_fix.patch
deleted file mode 100644
index d7e3141e06..0000000000
--- a/meta/recipes-extended/procps/procps/top_large_pid_fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f21fc624d960d12afa399af7333d4f9193fb2ffb Mon Sep 17 00:00:00 2001
-From: Jim Warner <james.warner@comcast.net>
-Date: Tue, 16 Sep 2025 12:00:00 -0500
-Subject: [PATCH] library: avoid possible segmentation fault, <pids> api
-Upstream-Status: Backport
-[https://gitlab.com/procps-ng/procps/-/commit/5461b50b1a85c5e556c4cd2739ca8ffdbc69399a]
-
-In the issue referenced below, that SEGV was caused by
-passing a '-1' pid to the procps_pids_select function.
-That value, in turn, is caused by providing a LONG_MAX
-or greater number for what was assigned to an integer.
-
-So, this commit will help ensure we avoid a match when
-we should fail plus skip some unproductive libc calls.
-
-[ the same problem occurs in that old 3.3.17 library ]
-
-Reference(s):
-https://gitlab.com/procps-ng/procps/-/issues/394
-
-Signed-off-by: Jim Warner <james.warner@comcast.net>
-Signed-off-by: Amaury Couderc <amaury.couderc@est.tech>
-
----
- library/readproc.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/library/readproc.c b/library/readproc.c
-index 2dfe4c9e..d0e039bf 100644
---- a/library/readproc.c
-+++ b/library/readproc.c
-@@ -1434,7 +1434,7 @@ static int listed_nextpid (PROCTAB *PT, proc_t *p) {
-   pid_t pid = *(PT->pids)++;
-   char *path = PT->path;
- 
--  if (pid) {
-+  if (pid > 0) {
-     snprintf(path, PROCPATHLEN, "/proc/%d", pid);
-     p->tid = p->tgid = pid;        // this tgid may be a huge fib |
- 
-@@ -1546,7 +1546,7 @@ PROCTAB *openproc(unsigned flags, ...) {
-         did_stat = 1;
-     }
-     PT->taskdir = NULL;
--    PT->taskdir_user = -1;
-+    PT->taskdir_user = -2;
-     PT->taskfinder = simple_nexttid;
-     PT->taskreader = simple_readtask;
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-extended/procps/procps_4.0.5.bb b/meta/recipes-extended/procps/procps_4.0.6.bb
similarity index 97%
rename from meta/recipes-extended/procps/procps_4.0.5.bb
rename to meta/recipes-extended/procps/procps_4.0.6.bb
index 0e0e06f0d2..168027077b 100644
--- a/meta/recipes-extended/procps/procps_4.0.5.bb
+++ b/meta/recipes-extended/procps/procps_4.0.6.bb
@@ -14,9 +14,8 @@ inherit autotools gettext pkgconfig update-alternatives
 
 SRC_URI = "git://gitlab.com/procps-ng/procps.git;protocol=https;branch=master;tag=v${PV} \
            file://sysctl.conf \
-           file://top_large_pid_fix.patch \
            "
-SRCREV = "f46b2f7929cdfe2913ed0a7f585b09d6adbf994e"
+SRCREV = "4dafddf4c3f4646caa517f039a2307e92657ec93"
 
 # Upstream has a custom autogen.sh which invokes po/update-potfiles as they
 # don't ship a po/POTFILES.in (which is silly).  Without that file gettext
-- 
2.34.1



^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [OE-core] [PATCH V2] procps: support ptest when TCLIBC is glibc
@ 2026-01-26 13:01 Ross Burton
  2026-01-27  8:58 ` [PATCH V3] " changqing.li
  0 siblings, 1 reply; 8+ messages in thread
From: Ross Burton @ 2026-01-26 13:01 UTC (permalink / raw)
  To: changqing.li@windriver.com; +Cc: openembedded-core@lists.openembedded.org

On 16 Jan 2026, at 09:27, Changqing Li via lists.openembedded.org <changqing.li=windriver.com@lists.openembedded.org> wrote:
> +SRC_URI:append:libc-glibc = " file://run-ptest"

Keep things simple and just add this to SRC_URI, it won’t cause any problems in musl builds.

> +    DEJATOOL=$(make -C testsuite -s -f Makefile -f - <<'EOF'
> +all:
> + $(info $(DEJATOOL))
> +EOF
> +)

You can use makefile-getvar (oe-core/scripts) for this, and do it later.

> +     rm -rf ${D}${PTEST_PATH}/testsuite/Makefile*
> +     rm -rf ${D}${PTEST_PATH}/testsuite/README
> +     find ${D}${PTEST_PATH}/testsuite/ -type f -name "*.o" -exec rm -f {} +
> +     find ${D}${PTEST_PATH}/src/ -type f -name "*.o" -exec rm -f {} +

Might be easier to use makefile-getvar to get the list of tests and then install them directly, instead of copying * and then deleting files.

Also find has a -delete option which is better than -exec rm.

> +     DEJATOOL=$(cat ${B}/testsuite/.dejatool)

Just use makefile-getvar here?

> +     sed -i -e "s#@DEJATOOL@#$DEJATOOL#g" ${D}${PTEST_PATH}/run-ptest
> +     for p in $DEJATOOL; do
> +        if [ "$p" = "ps" ]; then
> +            install -d ${D}${PTEST_PATH}/src/ps
> +            ln -sf ${base_bindir}/ps ${D}${PTEST_PATH}/src/ps/pscommand
> +        elif [ "$p" = "sysctl" ]; then
> +            ln -sf ${base_sbindir}/$p ${D}${PTEST_PATH}/src/$p
> +        elif [ "$p" = "kill" ] || [ "$p" = "pidof" ] || [ "$p" = "watch" ]; then
> +            ln -sf ${base_bindir}/$p ${D}${PTEST_PATH}/src/$p
> +        else
> +            ln -sf ${bindir}/$p ${D}${PTEST_PATH}/src/$p
> +        fi
> +     done

Not sure I understand the point of iterating a list and then switching off each item in the list. Why not just make all those symlinks without the loop and conditional?

> +RDEPENDS:${PN}-ptest += "dejagnu bash glibc-utils"

Have you verified that it _needs_ bash and we can’t send a little patch to use sh?

Ross

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-03-06  4:06 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-02-24  1:47 [PATCH 1/2] procps: upgrade from 4.0.5 to 4.0.6 Changqing Li
2026-02-24  1:47 ` [PATCH 2/2] procps: support ptest when TCLIBC is glibc Changqing Li
2026-02-26 13:13   ` [OE-core] " Ross Burton
2026-02-27  6:17     ` Changqing Li
2026-02-27  6:49     ` [PATCH V2] " Changqing Li
2026-03-05 15:16       ` [OE-core] " Ross Burton
2026-03-06  4:05         ` [PATCH V3] " Changqing Li
  -- strict thread matches above, loose matches on Subject: below --
2026-01-26 13:01 [OE-core] [PATCH V2] " Ross Burton
2026-01-27  8:58 ` [PATCH V3] " changqing.li

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox