* [PATCH 1/3] time: 1.9 -> 1.10
2026-05-08 14:44 [PATCH 0/3] Packages upgrade liezhi.yang
@ 2026-05-08 14:44 ` liezhi.yang
2026-05-08 14:45 ` [PATCH 2/3] nfs-utils: 2.8.7 -> 2.9.1 liezhi.yang
2026-05-08 14:45 ` [PATCH 3/3] strace: upgrade 6.19 -> 7.0 liezhi.yang
2 siblings, 0 replies; 6+ messages in thread
From: liezhi.yang @ 2026-05-08 14:44 UTC (permalink / raw)
To: openembedded-core
From: Robert Yang <liezhi.yang@windriver.com>
* Remove uneed patch, the src/resuse.c has been removed in 1.10:
0001-include-string.h-for-memset.patch
* Remove backported patches:
0002-maint-remove-K-R-declarations.patch
0003-maint-fix-compilation-errors-with-GCC-15.patch
0004-maint-remove-obsolete-autoconf-macros.patch
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../0001-include-string.h-for-memset.patch | 27 ----
.../0002-maint-remove-K-R-declarations.patch | 131 ------------------
...t-fix-compilation-errors-with-GCC-15.patch | 65 ---------
...aint-remove-obsolete-autoconf-macros.patch | 43 ------
.../time/{time_1.9.bb => time_1.10.bb} | 9 +-
5 files changed, 2 insertions(+), 273 deletions(-)
delete mode 100644 meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch
delete mode 100644 meta/recipes-extended/time/time/0002-maint-remove-K-R-declarations.patch
delete mode 100644 meta/recipes-extended/time/time/0003-maint-fix-compilation-errors-with-GCC-15.patch
delete mode 100644 meta/recipes-extended/time/time/0004-maint-remove-obsolete-autoconf-macros.patch
rename meta/recipes-extended/time/{time_1.9.bb => time_1.10.bb} (61%)
diff --git a/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch b/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch
deleted file mode 100644
index 1258a0d5eb..0000000000
--- a/meta/recipes-extended/time/time/0001-include-string.h-for-memset.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ebc3368161ee909d5f854af8928e7937e35da41f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 15 Aug 2022 07:24:24 -0700
-Subject: [PATCH 1/4] include string.h for memset()
-
-Fixes implicit function declaration warning e.g.
-
-resuse.c:103:3: error: call to undeclared library function 'memset' with type 'void *(void *, int, unsigned long)'
-
-Drop this patch when upgrading to 1.10+ future releases
-
-Upstream-Status: Inappropriate [Upstream has dropped using memset in reuse.c]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- src/resuse.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/resuse.c
-+++ b/src/resuse.c
-@@ -22,6 +22,7 @@
- */
-
- #include "config.h"
-+#include <string.h>
- #include <sys/time.h>
- #include <sys/wait.h>
- #include <sys/resource.h>
diff --git a/meta/recipes-extended/time/time/0002-maint-remove-K-R-declarations.patch b/meta/recipes-extended/time/time/0002-maint-remove-K-R-declarations.patch
deleted file mode 100644
index cfa2b0f63b..0000000000
--- a/meta/recipes-extended/time/time/0002-maint-remove-K-R-declarations.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From b4a9f76b5f30bda67a57a2c6df6221f95ed80b9b Mon Sep 17 00:00:00 2001
-From: Collin Funk <collin.funk1@gmail.com>
-Date: Mon, 12 Jan 2026 20:19:34 -0800
-Subject: [PATCH 2/4] maint: remove K&R declarations
-
-* src/resuse.c (resuse_start, resuse_end): Remove K&R declarations.
-* src/time.c (fprintargv, linear_argv, summarize, getargs)
-(main): Likewise.
-(run_command): Likewise. Avoid -Wincompatible-pointer-types.
-
-Upstream-Status: Backport [https://gitweb.git.savannah.gnu.org/gitweb/?p=time.git;a=commit;h=4eb6d87fc18929d75a444fbb05a2c4ec7fb052ba]
-Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
----
- src/resuse.c | 10 +---------
- src/time.c | 30 +++++++-----------------------
- 2 files changed, 8 insertions(+), 32 deletions(-)
-
-diff --git a/src/resuse.c b/src/resuse.c
-index 9d3d18a..5ba3057 100644
---- a/src/resuse.c
-+++ b/src/resuse.c
-@@ -48,8 +48,7 @@
- /* Prepare to measure a child process. */
-
- void
--resuse_start (resp)
-- RESUSE *resp;
-+resuse_start (RESUSE *resp)
- {
- #if HAVE_WAIT3
- gettimeofday (&resp->start, (struct timezone *) 0);
-@@ -66,16 +65,9 @@ resuse_start (resp)
- /* Wait for and fill in data on child process PID.
- Return 0 on error, 1 if ok. */
-
--#if __STDC__
- /* pid_t is short on BSDI, so don't try to promote it. */
- int
- resuse_end (pid_t pid, RESUSE *resp)
--#else
--int
--resuse_end (pid, resp)
-- pid_t pid;
-- RESUSE *resp;
--#endif
- {
- int status;
-
-diff --git a/src/time.c b/src/time.c
-index 7e07995..4438749 100644
---- a/src/time.c
-+++ b/src/time.c
-@@ -315,10 +315,7 @@ for details about the options it supports.\n",
- /* Print ARGV to FP, with each entry in ARGV separated by FILLER. */
-
- static void
--fprintargv (fp, argv, filler)
-- FILE *fp;
-- const char *const *argv;
-- const char *filler;
-+fprintargv (FILE *fp, const char *const *argv, const char *filler)
- {
- const char *const *av;
-
-@@ -341,8 +338,7 @@ fprintargv (fp, argv, filler)
- Print a message and return NULL if memory allocation failed. */
-
- static char *
--linear_argv (argv)
-- const char *const *argv;
-+linear_argv (const char *const *argv)
- {
- const char *const *s; /* Each string in ARGV. */
- char *new; /* Allocated space. */
-@@ -421,11 +417,7 @@ linear_argv (argv)
- RESP is resource information on the command. */
-
- static void
--summarize (fp, fmt, command, resp)
-- FILE *fp;
-- const char *fmt;
-- const char **command;
-- RESUSE *resp;
-+summarize (FILE *fp, const char *fmt, const char **command, RESUSE *resp)
- {
- unsigned long r; /* Elapsed real milliseconds. */
- unsigned long v; /* Elapsed virtual (CPU) milliseconds. */
-@@ -637,9 +629,7 @@ summarize (fp, fmt, command, resp)
- Return the command line to run and gather statistics on. */
-
- static const char **
--getargs (argc, argv)
-- int argc;
-- char **argv;
-+getargs (int argc, char **argv)
- {
- int optc;
- char *format; /* Format found in environment. */
-@@ -723,9 +713,7 @@ getargs (argc, argv)
- Put the statistics in *RESP. */
-
- static void
--run_command (cmd, resp)
-- char *const *cmd;
-- RESUSE *resp;
-+run_command (const char **cmd, RESUSE *resp)
- {
- pid_t pid; /* Pid of child. */
- sighandler interrupt_signal, quit_signal;
-@@ -738,9 +726,7 @@ run_command (cmd, resp)
- error (EXIT_CANCELED, errno, "cannot fork");
- else if (pid == 0)
- { /* If child. */
-- /* Don't cast execvp arguments; that causes errors on some systems,
-- versus merely warnings if the cast is left off. */
-- execvp (cmd[0], cmd);
-+ execvp (cmd[0], (char * const *) cmd);
- saved_errno = errno;
- error (0, errno, "cannot run %s", cmd[0]);
- _exit (saved_errno == ENOENT ? EXIT_ENOENT : EXIT_CANNOT_INVOKE);
-@@ -759,9 +745,7 @@ run_command (cmd, resp)
- }
-
- int
--main (argc, argv)
-- int argc;
-- char **argv;
-+main (int argc, char **argv)
- {
- const char **command_line;
- RESUSE res;
diff --git a/meta/recipes-extended/time/time/0003-maint-fix-compilation-errors-with-GCC-15.patch b/meta/recipes-extended/time/time/0003-maint-fix-compilation-errors-with-GCC-15.patch
deleted file mode 100644
index ef78002468..0000000000
--- a/meta/recipes-extended/time/time/0003-maint-fix-compilation-errors-with-GCC-15.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From f178a9cf1ff71bbf1054ad85588b1b7a313ee584 Mon Sep 17 00:00:00 2001
-From: Collin Funk <collin.funk1@gmail.com>
-Date: Mon, 12 Jan 2026 20:42:21 -0800
-Subject: [PATCH 3/4] maint: fix compilation errors with GCC 15
-
-GCC 15 changed the default to -std=gnu23 where the current code would
-cause -Wincompatible-pointer-types errors.
-
-Reported by Ondrej Pohorelsky <opohorel@redhat.com> in
-<https://lists.gnu.org/r/bug-time/2025-01/msg00000.html>
-and by Khem Raj <raj.khem@gmail.com> in
-<https://lists.gnu.org/r/bug-time/2025-03/msg00000.html>
-and by Marcin Serwin <marcin@serwin.dev> in
-<https://lists.gnu.org/r/bug-time/2025-10/msg00000.html>
-and by Sam James <sam@gentoo.org> in
-<https://savannah.gnu.org/bugs/?66450>.
-
-* configure.ac (AC_TYPE_SIGNAL): Remove obsolete macro.
-* src/time.c (sighandler): Remove type.
-(run_command): Use sighandler_t which is defined by glibc or provided by
-Gnulib.
-
-Upstream-Status: Backport [https://gitweb.git.savannah.gnu.org/gitweb/?p=time.git;a=commit;h=4bfc492fcfa7778df7fc473ee901c1bdfdb02de0]
-Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
----
- configure.ac | 1 -
- src/time.c | 6 +-----
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ede8fd5..beb2077 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -66,7 +66,6 @@ dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
- AC_TYPE_PID_T
- AC_TYPE_SIZE_T
--AC_TYPE_SIGNAL
-
- dnl Checks for library functions.
- AC_FUNC_VPRINTF
-diff --git a/src/time.c b/src/time.c
-index 4438749..b8309a0 100644
---- a/src/time.c
-+++ b/src/time.c
-@@ -74,10 +74,6 @@ enum
- "David MacKenzie", \
- "Assaf Gordon"
-
--
--/* A Pointer to a signal handler. */
--typedef RETSIGTYPE (*sighandler) ();
--
- /* msec = milliseconds = 1/1,000 (1*10e-3) second.
- usec = microseconds = 1/1,000,000 (1*10e-6) second. */
-
-@@ -716,7 +712,7 @@ static void
- run_command (const char **cmd, RESUSE *resp)
- {
- pid_t pid; /* Pid of child. */
-- sighandler interrupt_signal, quit_signal;
-+ sighandler_t interrupt_signal, quit_signal;
- int saved_errno;
-
- resuse_start (resp);
diff --git a/meta/recipes-extended/time/time/0004-maint-remove-obsolete-autoconf-macros.patch b/meta/recipes-extended/time/time/0004-maint-remove-obsolete-autoconf-macros.patch
deleted file mode 100644
index 4a49d79753..0000000000
--- a/meta/recipes-extended/time/time/0004-maint-remove-obsolete-autoconf-macros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 0b860a81d54b1d44823bd0b5ce3a817594fb388f Mon Sep 17 00:00:00 2001
-From: Collin Funk <collin.funk1@gmail.com>
-Date: Mon, 12 Jan 2026 21:06:53 -0800
-Subject: [PATCH 4/4] maint: remove obsolete autoconf macros
-
-* configure.ac (AC_PROG_CC): Call instead of AC_PROG_CC_STDC and
-AC_PROG_GCC_TRADITIONAL.
-(AC_CHECK_INCLUDES_DEFAULT, AC_PROG_EGREP): Use instead of
-AC_HEADER_STDC.
-
-Upstream-Status: Backport [https://gitweb.git.savannah.gnu.org/gitweb/?p=time.git;a=commit;h=d957319127352cc67de4de5fd5d1537f289c0a84]
-Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
----
- configure.ac | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index beb2077..1af59c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,10 +27,9 @@ AM_INIT_AUTOMAKE([
-
- dnl Checks for programs.
- AC_USE_SYSTEM_EXTENSIONS
--AC_PROG_CC_STDC
-+AC_PROG_CC
- AM_PROG_CC_C_O
- AC_PROG_CPP
--AC_PROG_GCC_TRADITIONAL
- AC_PROG_INSTALL
- AC_C_INLINE
-
-@@ -59,7 +58,9 @@ gl_WARN_ADD([-Wsuggest-attribute=pure])
- AC_SUBST([WARN_CFLAGS])
-
- dnl Checks for header files.
--AC_HEADER_STDC
-+AC_CHECK_INCLUDES_DEFAULT
-+AC_PROG_EGREP
-+
- AC_HEADER_SYS_WAIT
-
- dnl Checks for typedefs, structures, and compiler characteristics.
diff --git a/meta/recipes-extended/time/time_1.9.bb b/meta/recipes-extended/time/time_1.10.bb
similarity index 61%
rename from meta/recipes-extended/time/time_1.9.bb
rename to meta/recipes-extended/time/time_1.10.bb
index 9436a83cca..d59fde4d92 100644
--- a/meta/recipes-extended/time/time_1.9.bb
+++ b/meta/recipes-extended/time/time_1.10.bb
@@ -13,14 +13,9 @@ ALTERNATIVE_PRIORITY = "100"
BBCLASSEXTEND = "native nativesdk"
-SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
- file://0001-include-string.h-for-memset.patch \
- file://0002-maint-remove-K-R-declarations.patch \
- file://0003-maint-fix-compilation-errors-with-GCC-15.patch \
- file://0004-maint-remove-obsolete-autoconf-macros.patch \
- "
+SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz"
-SRC_URI[sha256sum] = "fbacf0c81e62429df3e33bda4cee38756604f18e01d977338e23306a3e3b521e"
+SRC_URI[sha256sum] = "e8c29fb4ab599d8478e41e8618f50db8aede9c90af27d0d2ef28ae50d5de09c3"
inherit autotools
--
2.49.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/3] strace: upgrade 6.19 -> 7.0
2026-05-08 14:44 [PATCH 0/3] Packages upgrade liezhi.yang
2026-05-08 14:44 ` [PATCH 1/3] time: 1.9 -> 1.10 liezhi.yang
2026-05-08 14:45 ` [PATCH 2/3] nfs-utils: 2.8.7 -> 2.9.1 liezhi.yang
@ 2026-05-08 14:45 ` liezhi.yang
2026-05-12 13:20 ` [OE-core] " Ross Burton
2 siblings, 1 reply; 6+ messages in thread
From: liezhi.yang @ 2026-05-08 14:45 UTC (permalink / raw)
To: openembedded-core
From: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
..._key_file.c-Fix-build-error-for-musl.patch | 31 ++++++++++
.../nfs-utils/nfs-utils_2.9.1.bb | 1 +
...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 +-
13 files changed, 123 insertions(+), 21 deletions(-)
create mode 100644 meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fh_key_file.c-Fix-build-error-for-musl.patch
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-connectivity/nfs-utils/nfs-utils/0001-fh_key_file.c-Fix-build-error-for-musl.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fh_key_file.c-Fix-build-error-for-musl.patch
new file mode 100644
index 0000000000..6dc48353cb
--- /dev/null
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-fh_key_file.c-Fix-build-error-for-musl.patch
@@ -0,0 +1,31 @@
+From 98048fd9262b3e4e024248ebd07d5ff66175e4ec Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 7 May 2026 03:32:57 -0700
+Subject: [PATCH] fh_key_file.c: Fix build error with musl
+
+Fixed:
+error: implicit declaration of function 'strerror'
+
+Upstream-Status: Submitted [https://lore.kernel.org/linux-nfs/CD3EAA3F-F758-4CAF-A692-065CA82917AC@hammerspace.com/T/#t]
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ support/nfs/fh_key_file.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/support/nfs/fh_key_file.c b/support/nfs/fh_key_file.c
+index 5f5eafc..89555ce 100644
+--- a/support/nfs/fh_key_file.c
++++ b/support/nfs/fh_key_file.c
+@@ -30,6 +30,8 @@
+
+ #include "nfslib.h"
+
++#include <string.h>
++
+ #define HASH_BLOCKSIZE 256
+ int hash_fh_key_file(const char *fh_key_file, uuid_t uuid)
+ {
+--
+2.49.0
+
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb
index 39a747d344..6f00bee0d8 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb
@@ -23,6 +23,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
file://nfscommon \
file://0004-Use-nogroup-for-nobody-group.patch \
file://0005-find-OE-provided-Kerberos.patch \
+ file://0001-fh_key_file.c-Fix-build-error-for-musl.patch \
"
SRC_URI[sha256sum] = "302846343bf509f8f884c23bdbd0fe853b7f7cbb6572060a9082279d13b21a2c"
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 <raj.khem@gmail.com>
+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 <raj.khem@gmail.com>
+---
+ 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 <raj.khem@gmail.com>
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 <raj.khem@gmail.com>
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 <khem.raj@oss.qualcomm.com>
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 <jpuhlman@mvista.com>
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 <raj.khem@gmail.com>
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 <gabriel.barbu@enea.com>
Date: Thu, 25 Jul 2013 15:28:33 +0200
Subject: [PATCH] strace: Add ptest
@@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
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 <richard.purdie@linuxfoundation.org>
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 <richard.purdie@linuxfoundation.org>
+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 <ross.burton@arm.com>
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 <armccurdy@gmail.com>
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"
inherit autotools github-releases ptest
--
2.49.0
^ permalink raw reply related [flat|nested] 6+ messages in thread