strace: upgrade 5.19 -> 7.1
v4 cover strace: upgrade 5.19 -> 7.1
From: Robert Yang <[email protected]>
* V4
- Append BPN to FILESPATH to help devtool
* V3:
- strace: Remove strace/0001-Ignore-pwritev-pwrite64-tests-on-musl.patch
* V2:
- ufs-utils: Move 0001-fh_key_file.c-Fix-build-error-for-musl.patch into nfs-utils' commit.
- strace: Remove HASHEQUIV_HASH_VERSION
* V1:
- Initial version
The following changes since commit eeea0396b60e50ddb636088eee8ffe23c512d367:
gawk: add Signed-off-by to randtest backport (2026-06-05 15:50:12 +0100)
// Robert
are available in the Git repository at:
https://github.com/robertlinux/yocto rbt/strace
https://github.com/robertlinux/yocto/tree/rbt/strace
for you to fetch changes up to e0bd331774d63d49c173b88711ed04005048bcb0:
strace: upgrade 5.19 -> 7.1 (2026-06-16 02:29:48 -0700)
----------------------------------------------------------------
Robert Yang (2):
strace: Append BPN to FILESPATH to help devtool
strace: upgrade 5.19 -> 7.1
...gnore-pwritev-pwrite64-tests-on-musl.patch | 16 ++++++++----
...toconf-macro-to-detect-largefile-sup.patch | 4 +--
...kport-ax_prog_cc_for_build.m4-macros.patch | 2 +-
...001-strace-fix-reproducibilty-issues.patch | 2 +-
...002-tests-Replace-off64_t-with-off_t.patch | 2 +-
.../strace/strace/Makefile-ptest.patch | 6 ++---
.../strace/strace/ptest-spacesave.patch | 2 +-
.../strace/strace/skip-bpf.patch | 25 +++++++++++++------
.../strace/strace/skip-load.patch | 6 ++---
.../strace/strace/update-gawk-paths.patch | 2 +-
.../strace/{strace_6.19.bb => strace_7.1.bb} | 8 +++---
11 files changed, 45 insertions(+), 30 deletions(-)
rename meta/recipes-devtools/strace/{strace_6.19.bb => strace_7.1.bb} (90%)Signature · 1 line
2.49.0
PATCH v4 1/2 strace: Append BPN to FILESPATH to help devtool
From: Robert Yang <[email protected]>
The 'devtool finish" added 0001-Ignore-pwritev-pwrite64-tests-on-musl.patch to strace/files rather than strace/strace
This is because the 0001-Ignore-pwritev-pwrite64-tests-on-musl.patch is a conditional patch:
SRC_URI:append:libc-musl = "\
file://0001-Ignore-pwritev-pwrite64-tests-on-musl.patch \
"So the devtool won't copy it into workspace, then bb.utils.which() can't find it, and will return the last section in FILESPATH which is strace/files, I can't a regular way to fix it because that's how the bb.utils.which() and localpath works. But there a workaround, add the following line to the recipe can fix the problem:
FILESPATH .= ":${FILE_DIRNAME}/${BPN}"
--- meta/recipes-devtools/strace/strace_6.19.bb | 4 ++++ 1 file changed, 4 insertions(+)
meta/recipes-devtools/strace/strace_6.19.bb +4 -0
@@ -22,6 +22,10 @@ SRC_URI:append:libc-musl = "\ " SRC_URI[sha256sum] = "e076c851eec0972486ec842164fdc54547f9d17abd3d1449de8b120f5d299143" +# To help "devtool finish" can add 0001-Ignore-pwritev-pwrite64-tests-on-musl.patch +# into strace/strace rather than strace/files. +FILESPATH .= ":${FILE_DIRNAME}/${BPN}" + # remove at next version upgrade or when output changes PR = "r1" HASHEQUIV_HASH_VERSION .= ".1"
Signature · 1 line
2.49.0
PATCH v4 2/2 strace: upgrade 5.19 -> 7.1
In reply to [email protected]From: Robert Yang <[email protected]>
* Release notes:
https://github.com/strace/strace/releases
---
...gnore-pwritev-pwrite64-tests-on-musl.patch | 16 ++++++++----
...toconf-macro-to-detect-largefile-sup.patch | 4 +--
...kport-ax_prog_cc_for_build.m4-macros.patch | 2 +-
...001-strace-fix-reproducibilty-issues.patch | 2 +-
...002-tests-Replace-off64_t-with-off_t.patch | 2 +-
.../strace/strace/Makefile-ptest.patch | 6 ++---
.../strace/strace/ptest-spacesave.patch | 2 +-
.../strace/strace/skip-bpf.patch | 25 +++++++++++++------
.../strace/strace/skip-load.patch | 6 ++---
.../strace/strace/update-gawk-paths.patch | 2 +-
.../strace/{strace_6.19.bb => strace_7.1.bb} | 6 +----
11 files changed, 42 insertions(+), 31 deletions(-)
rename meta/recipes-devtools/strace/{strace_6.19.bb => strace_7.1.bb} (93%)meta/recipes-devtools/strace/strace/0001-Ignore-pwritev-pwrite64-tests-on-musl.patch +11 -5
@@ -1,4 +1,4 @@ -From 13fd22ad0df5b80c428d3ecc0114fb340f3b3894 Mon Sep 17 00:00:00 2001 +From 42b04443d797345e4dc1f933017a66cd726a5c61 Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Mon, 18 Aug 2025 22:18:58 -0700 Subject: [PATCH] Ignore pwritev/pwrite64 tests on musl
@@ -19,11 +19,13 @@ Issue is reported upstream [3] Upstream-Status: Inappropriate [Musl Specific] Signed-off-by: Khem Raj <[email protected]> --- - tests/pread64-pwrite64.gen.test | 2 ++ - tests/preadv-pwritev.gen.test | 2 ++ - tests/pwritev.gen.test | 2 ++ - 3 files changed, 6 insertions(+) + tests/pread64-pwrite64.gen.test | 3 +++ + tests/preadv-pwritev.gen.test | 3 +++ + tests/pwritev.gen.test | 3 +++ + 3 files changed, 9 insertions(+) +diff --git a/tests/pread64-pwrite64.gen.test b/tests/pread64-pwrite64.gen.test +index b53e069..0a1e6e6 100755 --- a/tests/pread64-pwrite64.gen.test +++ b/tests/pread64-pwrite64.gen.test @@ -1,4 +1,7 @@
@@ -34,6 +36,8 @@ Signed-off-by: Khem Raj <[email protected]> +skip_ "Test not ported to musl, musl generates pwritev2" + run_strace_match_diff -a21 -eread=0 -ewrite=1 -e trace=pread64,pwrite64 -P pread64-pwrite64-tmpfile -P /dev/zero -P /dev/null +diff --git a/tests/preadv-pwritev.gen.test b/tests/preadv-pwritev.gen.test +index 5ed8297..b83f129 100755 --- a/tests/preadv-pwritev.gen.test +++ b/tests/preadv-pwritev.gen.test @@ -1,4 +1,7 @@
@@ -44,6 +48,8 @@ Signed-off-by: Khem Raj <[email protected]> +skip_ "Test not ported to musl, musl generates pwritev2" + run_strace_match_diff -a19 -eread=0 -ewrite=1 -e trace=preadv,pwritev +diff --git a/tests/pwritev.gen.test b/tests/pwritev.gen.test +index e54fd15..4999816 100755 --- a/tests/pwritev.gen.test +++ b/tests/pwritev.gen.test @@ -1,4 +1,7 @@
meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch +2 -2
@@ -1,4 +1,4 @@ -From 4c7112f36a70d3034c583ab45058491129111585 Mon Sep 17 00:00:00 2001 +From 2d134e7c5a3b82e0b4c969285b1da0c3a113168b Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:54:27 -0800 Subject: [PATCH] configure: Use autoconf macro to detect largefile support
@@ -13,7 +13,7 @@ Signed-off-by: Khem Raj <[email protected]> 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index ad12d20..a760789 100644 +index 956bb85..0812725 100644 --- a/configure.ac +++ b/configure.ac @@ -43,6 +43,8 @@ AC_PROG_INSTALL
meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch +1 -1
@@ -1,4 +1,4 @@ -From 00de0004bbb7c0816f9f899345971c148c9e59d9 Mon Sep 17 00:00:00 2001 +From dafd84d28d29d69ed0eb4c63b7365bf7831e42cc Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Fri, 10 Apr 2026 23:39:47 +0000 Subject: [PATCH] m4: Backport ax_prog_cc_for_build.m4 macros
meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch +1 -1
@@ -1,4 +1,4 @@ -From d0bbbf170f70746b2b8e9bb6129b0b9441a1c4b5 Mon Sep 17 00:00:00 2001 +From 02b64b8f3ae6387cb1dadb442f554702ec47a454 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman <[email protected]> Date: Wed, 11 Mar 2020 19:56:55 +0000 Subject: [PATCH] strace: fix reproducibilty issues
meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch +1 -1
@@ -1,4 +1,4 @@ -From f487e2a0f1568c989a0294f4335f3dc9a6012d8d Mon Sep 17 00:00:00 2001 +From 742340d4422aee46c2b05d6b301ddcb78e0c37fb Mon Sep 17 00:00:00 2001 From: Khem Raj <[email protected]> Date: Thu, 15 Dec 2022 15:56:13 -0800 Subject: [PATCH] tests: Replace off64_t with off_t
meta/recipes-devtools/strace/strace/Makefile-ptest.patch +3 -3
@@ -1,4 +1,4 @@ -From 6d77203fb22e076918dc983db47b48b28cbbc06d Mon Sep 17 00:00:00 2001 +From 3043c6bfeeb55d56dfc9f1b8cbe7d01b8c2556e6 Mon Sep 17 00:00:00 2001 From: Gabriel Barbu <[email protected]> Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <[email protected]> 1 file changed, 20 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index d76b5c6..d4fc206 100644 +index f37d053..975f878 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -24,7 +24,7 @@ index d76b5c6..d4fc206 100644 AM_CFLAGS = $(WARN_CFLAGS) $(TEST_WARN_CFLAGS) bundled_CPPFLAGS = if USE_BUNDLED_HEADERS -@@ -939,3 +940,22 @@ BUILT_SOURCES = ksysent.h +@@ -967,3 +968,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS) CLEANFILES = ksysent.h include ../src/scno.am
meta/recipes-devtools/strace/strace/ptest-spacesave.patch +1 -1
@@ -1,4 +1,4 @@ -From 76c23e018608421624d1e00b9e387b265e6da469 Mon Sep 17 00:00:00 2001 +From 2d1ef82864f037b8dd029ae870ac0c2f1fd14321 Mon Sep 17 00:00:00 2001 From: Richard Purdie <[email protected]> Date: Wed, 29 May 2019 00:10:32 +0100 Subject: [PATCH] strace: Tweak ptest disk space management
meta/recipes-devtools/strace/strace/skip-bpf.patch +17 -8
@@ -1,22 +1,31 @@ +From b51fb304845674d3952e8420e641ccdaeab519c6 Mon Sep 17 00:00:00 2001 +From: Richard Purdie <[email protected]> +Date: Mon, 22 Dec 2025 12:14:45 +0000 +Subject: [PATCH] strace: Skip bpd tests for now since they don't work with the + These tests failed when upgrading to 6.18. Skip them for now until the issue can be resolved as the upgrade is needed for newer kernel versons. Upstream-Status: Inappropriate [issue reported at https://github.com/strace/strace/issues/370] +--- + tests/bpf-v.gen.test | 1 + + tests/bpf.gen.test | 1 + + 2 files changed, 2 insertions(+) -Index: strace-6.16/tests/bpf-v.gen.test -=================================================================== ---- strace-6.16.orig/tests/bpf-v.gen.test -+++ strace-6.16/tests/bpf-v.gen.test +diff --git a/tests/bpf-v.gen.test b/tests/bpf-v.gen.test +index e57154e..440ddfe 100755 +--- a/tests/bpf-v.gen.test ++++ b/tests/bpf-v.gen.test @@ -1,4 +1,5 @@ #!/bin/sh -efu # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (bpf-v -a20 -v -e trace=bpf); do not edit. . "${srcdir=.}/init.sh" +skip_ "Test doesn't work atm" run_strace_match_diff -a20 -v -e trace=bpf -Index: strace-6.16/tests/bpf.gen.test -=================================================================== ---- strace-6.16.orig/tests/bpf.gen.test -+++ strace-6.16/tests/bpf.gen.test +diff --git a/tests/bpf.gen.test b/tests/bpf.gen.test +index 1391d6b..c4906b1 100755 +--- a/tests/bpf.gen.test ++++ b/tests/bpf.gen.test @@ -1,4 +1,5 @@ #!/bin/sh -efu # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (bpf -a20 ); do not edit.
meta/recipes-devtools/strace/strace/skip-load.patch +3 -3
@@ -1,4 +1,4 @@ -From 40244c27de6b8fa0f6f6685d20e64309884e73bf Mon Sep 17 00:00:00 2001 +From 7948396c248863941e47431b3a0e0be225c1b601 Mon Sep 17 00:00:00 2001 From: Ross Burton <[email protected]> Date: Sat, 30 Aug 2025 00:47:03 +0200 Subject: [PATCH] strace: skip a number of load-sensitive tests
@@ -49,7 +49,7 @@ index 41928de..f8a87cb 100755 +skip_ "Test not reliable under load" run_strace_match_diff -a20 diff --git a/tests/strace-r.test b/tests/strace-r.test -index 8299737..e894234 100755 +index a85558d..9ae9677 100755 --- a/tests/strace-r.test +++ b/tests/strace-r.test @@ -9,6 +9,7 @@
@@ -59,4 +59,4 @@ index 8299737..e894234 100755 +skip_ "Test not reliable under load" r_opt="${1:--r}" - run_prog ../sleep 0 + run_prog ../sleep-timing 0 "$TIMING_FILE"
meta/recipes-devtools/strace/strace/update-gawk-paths.patch +1 -1
@@ -1,4 +1,4 @@ -From 71bcc83993dd1f8f30c3defaece23211c9b73f33 Mon Sep 17 00:00:00 2001 +From aeefba8a6a7822fb30fcc07f86a96813a28f2bf9 Mon Sep 17 00:00:00 2001 From: Andre McCurdy <[email protected]> Date: Mon, 18 Jan 2016 11:01:00 -0800 Subject: [PATCH] update gawk paths, /bin/gawk -> /usr/bin/gawk
meta/recipes-devtools/strace/strace_7.1.bb renamed from meta/recipes-devtools/strace/strace_6.19.bb +1 -5
@@ -20,16 +20,12 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/strace-${PV}.tar.xz \ SRC_URI:append:libc-musl = "\ file://0001-Ignore-pwritev-pwrite64-tests-on-musl.patch \ " -SRC_URI[sha256sum] = "e076c851eec0972486ec842164fdc54547f9d17abd3d1449de8b120f5d299143" +SRC_URI[sha256sum] = "81743ecf2a5b44186b2f5038afdc8beda7e5c70aed15b4fbfbcc6e9ece24490f" # To help "devtool finish" can add 0001-Ignore-pwritev-pwrite64-tests-on-musl.patch # into strace/strace rather than strace/files. FILESPATH .= ":${FILE_DIRNAME}/${BPN}" -# remove at next version upgrade or when output changes -PR = "r1" -HASHEQUIV_HASH_VERSION .= ".1" - inherit autotools github-releases ptest # Not yet ported to rv32
Signature · 1 line
2.49.0
Re: [OE-core] [PATCH v4 1/2] strace: Append BPN to FILESPATH to help devtool
In reply to [email protected]meta/recipes-devtools/strace/strace_6.19.bb SRC_URI:append:libc-musl = "\ · line 27
Quoted 3 lines · Robert Yang via lists.openembedded.org
meta/recipes-devtools/strace/strace_6.19.bb +3
-0+# To help "devtool finish" can add 0001-Ignore-pwritev-pwrite64-tests-on-musl.patch +# into strace/strace rather than strace/files. +FILESPATH .= ":${FILE_DIRNAME}/${BPN}"
I'm afraid I have to disagree with this. Devtool does have support for conditional patches as seen here:
====
alex@Zen2:/srv/storage/alex/yocto/build-riscv64$ devtool modify strace ... INFO: SRC_URI contains some conditional appends/prepends - will create branches to represent these ... WARNING: SRC_URI is conditionally overridden in this recipe, thus several devtool-override-* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the devtool branch first, then checkout and rebase each devtool-override-* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe) ...
alex@Zen2:/srv/storage/alex/yocto/build-riscv64/workspace/sources/strace$ git branch
* devtool
devtool-no-overrides
devtool-override-libc-musl
master
====
so this strace issue is hitting a bug in that conditional patch support. Rather, it should be investigated why is devtool writing out a duplicate of the patch to a different location on 'finish' operation.
Alex
Re: [OE-core] [PATCH v4 1/2] strace: Append BPN to FILESPATH to help devtool
Hi Alex,
Quoted 10 lines · Alexander Kanavin
meta/recipes-devtools/strace/strace_6.19.bb SRC_URI:append:libc-musl = "\ · line 27
Quoted 3 lines · Robert Yang via lists.openembedded.org
meta/recipes-devtools/strace/strace_6.19.bb +3
-0+# To help "devtool finish" can add 0001-Ignore-pwritev-pwrite64-tests-on-musl.patch +# into strace/strace rather than strace/files. +FILESPATH .= ":${FILE_DIRNAME}/${BPN}"I'm afraid I have to disagree with this. Devtool does have support for conditional patches as seen here:
====
Quoted 12 lines
alex@Zen2:/srv/storage/alex/yocto/build-riscv64$ devtool modify strace ... INFO: SRC_URI contains some conditional appends/prepends - will create branches to represent these ... WARNING: SRC_URI is conditionally overridden in this recipe, thus several devtool-override-* branches have been created, one for each override that makes changes to SRC_URI. It is recommended that you make changes to the devtool branch first, then checkout and rebase each devtool-override-* branch and update any unique patches there (duplicates on those branches will be ignored by devtool finish/update-recipe)
The problem is that "devtool upgrade" doesn't copy the overridden patch to workspace because it is not in SRC_URI, I'm trying to see how to make it copy that.
// Robert
Quoted 16 lines
...
alex@Zen2:/srv/storage/alex/yocto/build-riscv64/workspace/sources/strace$ git branch
* devtool
devtool-no-overrides
devtool-override-libc-musl
master
====so this strace issue is hitting a bug in that conditional patch support. Rather, it should be investigated why is devtool writing out a duplicate of the patch to a different location on 'finish' operation.
Alex