From: Robert Yang <[email protected]>
Signed-off-by: Robert Yang <[email protected]>
---
...gnore-pwritev-pwrite64-tests-on-musl.patch | 62 +++++++++++++++++++
...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 | 2 +-
.../strace/strace/update-gawk-paths.patch | 2 +-
.../strace/{strace_6.19.bb => strace_7.0.bb} | 3 +-
11 files changed, 91 insertions(+), 21 deletions(-)
create mode 100644
meta/recipes-devtools/strace/files/0001-Ignore-pwritev-pwrite64-tests-on-musl.patch
rename meta/recipes-devtools/strace/{strace_6.19.bb => strace_7.0.bb} (96%)
diff --git
a/meta/recipes-devtools/strace/files/0001-Ignore-pwritev-pwrite64-tests-on-musl.patch
b/meta/recipes-devtools/strace/files/0001-Ignore-pwritev-pwrite64-tests-on-musl.patch
new file mode 100644
index 0000000000..d19533854c
--- /dev/null
+++
b/meta/recipes-devtools/strace/files/0001-Ignore-pwritev-pwrite64-tests-on-musl.patch
@@ -0,0 +1,62 @@
+From 3c692ce22a70e9fa4cc21afa56d03a9adcd5d2a2 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
+
+musl uses wrappers for pwritev and pwrite64 using
+pwritev2 syscall [1], however the test exepcts that the
+program will call pwritev and pwrite64 ( glibc behavior )
+
+This can be fixed if the function calls are changed to
+use syscall() API directly, but that needs change upstream [2]
+
+Issue is reported upstream [3]
+
+[1]
https://git.musl-libc.org/cgit/musl/commit/src?id=5370070fded61b569196764673a4fc8440aac79e
+[2] https://github.com/strace/strace/pull/347
+[3] https://github.com/strace/strace/issues/349
+
+Upstream-Status: Inappropriate [Musl Specific]
+Signed-off-by: Khem Raj <[email protected]>
+---
+ 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 @@
+ #!/bin/sh -efu
+ # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in
(pread64-pwrite64 -a21 -eread=0 -ewrite=1 -e trace=pread64,pwrite64 -P
pread64-pwrite64-tmpfile -P /dev/zero -P /dev/null); do not edit.
+ . "${srcdir=.}/init.sh"
++
++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 @@
+ #!/bin/sh -efu
+ # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (preadv-pwritev
-a19 -eread=0 -ewrite=1 -e trace=preadv,pwritev); do not edit.
+ . "${srcdir=.}/init.sh"
++
++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 @@
+ #!/bin/sh -efu
+ # Generated by ./tests/gen_tests.sh from ./tests/gen_tests.in (pwritev -a22
-s7); do not edit.
+ . "${srcdir=.}/init.sh"
++
++skip_ "Test not ported to musl, musl generates pwritev2"
++
+ run_strace_match_diff -a22 -s7
diff --git
a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
index 1750f34518..bda5156cdf 100644
---
a/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
+++
b/meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
@@ -1,4 +1,4 @@
-From 4c7112f36a70d3034c583ab45058491129111585 Mon Sep 17 00:00:00 2001
+From 36df82284b1e8c3d7338c315016a8e74c0978e32 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
diff --git
a/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch
b/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch
index 68a1a4230a..920c2e4faf 100644
---
a/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch
+++
b/meta/recipes-devtools/strace/strace/0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch
@@ -1,4 +1,4 @@
-From 00de0004bbb7c0816f9f899345971c148c9e59d9 Mon Sep 17 00:00:00 2001
+From dd821aebdefb3531202bcd51fce5e2bd74c1512d 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
diff --git
a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
index c633531f44..77f90bf0d1 100644
---
a/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
+++
b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
@@ -1,4 +1,4 @@
-From d0bbbf170f70746b2b8e9bb6129b0b9441a1c4b5 Mon Sep 17 00:00:00 2001
+From bb0cd804214054ef95193daa0b7076ed5be1c881 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
diff --git
a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
index 093cedc233..7daf3f6763 100644
---
a/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
+++
b/meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
@@ -1,4 +1,4 @@
-From f487e2a0f1568c989a0294f4335f3dc9a6012d8d Mon Sep 17 00:00:00 2001
+From 2d6384cd2b6b923ea3eb6863beb0bfaf6bf628c2 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
diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
index 60562ae7d9..3d23e34244 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -1,4 +1,4 @@
-From 6d77203fb22e076918dc983db47b48b28cbbc06d Mon Sep 17 00:00:00 2001
+From 21747b62c36689b68fac7e987a9b93b998f692e3 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 7d80e07..1e0e064 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
+@@ -950,3 +951,22 @@ BUILT_SOURCES = ksysent.h
CLEANFILES = ksysent.h
include ../src/scno.am
diff --git a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
index 3e66b15850..14ad35be74 100644
--- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
+++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
@@ -1,4 +1,4 @@
-From 76c23e018608421624d1e00b9e387b265e6da469 Mon Sep 17 00:00:00 2001
+From 0b3d278fa808a21d4300a71d062807f905671bf9 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
diff --git a/meta/recipes-devtools/strace/strace/skip-bpf.patch
b/meta/recipes-devtools/strace/strace/skip-bpf.patch
index b058b0ba03..1fa8c2db2d 100644
--- a/meta/recipes-devtools/strace/strace/skip-bpf.patch
+++ b/meta/recipes-devtools/strace/strace/skip-bpf.patch
@@ -1,22 +1,31 @@
+From 66edf5d44ba89f73d51657edeeb19fc10d008aea 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.
diff --git a/meta/recipes-devtools/strace/strace/skip-load.patch
b/meta/recipes-devtools/strace/strace/skip-load.patch
index 20535fe005..dc88706948 100644
--- a/meta/recipes-devtools/strace/strace/skip-load.patch
+++ b/meta/recipes-devtools/strace/strace/skip-load.patch
@@ -1,4 +1,4 @@
-From 40244c27de6b8fa0f6f6685d20e64309884e73bf Mon Sep 17 00:00:00 2001
+From 7fc69711b5e216c385b22a5b64c6c7c8be693600 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
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
index bf4a8cd123..c47ca08dd4 100644
--- a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
+++ b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
@@ -1,4 +1,4 @@
-From 71bcc83993dd1f8f30c3defaece23211c9b73f33 Mon Sep 17 00:00:00 2001
+From 6bc97ed4e26ca4d275c10f5b4f56fc43a8e12925 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
diff --git a/meta/recipes-devtools/strace/strace_6.19.bb
b/meta/recipes-devtools/strace/strace_7.0.bb
similarity index 96%
rename from meta/recipes-devtools/strace/strace_6.19.bb
rename to meta/recipes-devtools/strace/strace_7.0.bb
index 7b8d4851fb..1150cfda61 100644
--- a/meta/recipes-devtools/strace/strace_6.19.bb
+++ b/meta/recipes-devtools/strace/strace_7.0.bb
@@ -20,10 +20,9 @@ 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] =
"6c92419be3f2ec560b31728a4652217c59864c8642ba7b1b3771b1b013ad074b"
# remove at next version upgrade or when output changes
-PR = "r1"
HASHEQUIV_HASH_VERSION .= ".1"
