From patchwork Fri May 8 14:44:59 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 87753 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37024CD37AD for ; Fri, 8 May 2026 14:45:12 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.15393.1778251504781209618 for ; Fri, 08 May 2026 07:45:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=gI1ZWKd4; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9588382931=liezhi.yang@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 648B4eeX470902 for ; Fri, 8 May 2026 14:45:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=i/jfRsmwL3EiaUpHVRj6Pcp0Qsfe53vpZ69JAjQor+8=; b=gI1ZWKd4rT+s DfRhG+vf9y7VoPi5KEfIL/XfOgVenY5xSTmjece6Ik/mTfgP+0tCE+uyGV6oZwNQ HPrlx4u6KfNK/G0MqYufjwuzw0CHrnbcDSxqkfQpT6kGbZycgFuMreQSWo32z1Zt oJFY+ccrxg5OTlRHdFFvQ+sFcQCTTQ1ErNY+a1XhN6l9nJdF/ofG7nHQxT9Z4nn7 t2snLhytdQQBlOwmSwmeM7wBO7bYuIj4uDtH9oLVFg2CiaEOISTvFNgbl8TSH0Ft mdUa8cwYvLYeJ0kFeHV+cDuAxCH7LuP/8K6B7ZwYsf0VukM+MJCEUlB8SEGskUbk XsSZHvvOQQ== Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [128.224.246.37]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4e1cbvrc3v-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 08 May 2026 14:45:03 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.61; Fri, 8 May 2026 07:45:01 -0700 Received: from ala-lpggp3.wrs.com (10.11.232.110) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server id 15.1.2507.61 via Frontend Transport; Fri, 8 May 2026 07:45:01 -0700 From: To: Subject: [PATCH 1/3] time: 1.9 -> 1.10 Date: Fri, 8 May 2026 07:44:59 -0700 Message-ID: <9794ad872630866ca298282a25bc5722c001522d.1778251103.git.liezhi.yang@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: poynhhn10S3YjNOjuh3SZoFUJidOOdGh X-Proofpoint-GUID: poynhhn10S3YjNOjuh3SZoFUJidOOdGh X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA4MDE1MCBTYWx0ZWRfX7joSHY0bcRv2 iUpbL40wloWRAy6V9j6cLIQjZuN/rwJ6C0YDF3u7EyNT6+KCLdJ4sofXZYW2Ao4K+TYN2ny3dh0 XW2S1yUHdSSO4oEQvxqcTp5SBpThTEIVfq52iWHFWYi0vD0SBMng6NiqytyWpf47HBz4a70nH0/ ZRjqYMSC479dly8vvb24H9FosAUtvLbFKtFYGQnEPObTrto4tGlpY3X6dot3nV2U42tUajey/ue nPd/fmjvQ5iNJXmqUTz397TXM5igN0P8kHQCSFATAwxOb9XpkGNoFE+XOnI20ifHfyiQH6VZTfL 7KJZQpjiXResZv4uqp2E21jtX+vewApSzzmw+3vZN/cuoZCj9H50gp51hIOHvrA68oZrNa1C6du iQLEUeB1ec/oyFZ/9/1z8net6zGo0ozoqIodpmlf5VHTMkpAjZpPbkK7rysM0Vdm2SlTq+EpV9a R4Lf7XXlichdIQlatYw== X-Authority-Analysis: v=2.4 cv=U9iiy+ru c=1 sm=1 tr=0 ts=69fdf6ef cx=c_pps a=Lg6ja3A245NiLSnFpY5YKQ==:117 a=Lg6ja3A245NiLSnFpY5YKQ==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=fTW__CHxibyLmBMfj2wP:22 a=mDV3o1hIAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=20KFwNOVAAAA:8 a=7mOBRU54AAAA:8 a=7VCH-C7_lETss_BExYoA:9 a=3A4WKLa3fEv9RwDY:21 a=FdTzh2GWekK77mhwV6Dw:22 a=wa9RWnbW_A1YIeRBVszw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-07_02,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 priorityscore=1501 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605080150 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 May 2026 14:45:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236720 From: Robert Yang * 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 --- .../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 -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 ---- - 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 - #include - #include - #include 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 -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 ---- - 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 -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 in - -and by Khem Raj in - -and by Marcin Serwin in - -and by Sam James in -. - -* 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 ---- - 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 -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 ---- - 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 From patchwork Fri May 8 14:45:00 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 87750 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2865FCD3436 for ; Fri, 8 May 2026 14:45:12 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.15477.1778251505763564687 for ; Fri, 08 May 2026 07:45:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=a7X0WZbl; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9588382931=liezhi.yang@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 648B4eeZ470902 for ; Fri, 8 May 2026 14:45:04 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=eFOSc4GP0xuIBrSXDsAvzlqHpWMGhKWzEUVUzmgTKv8=; b=a7X0WZbluyqu bN/wSIpcgxrWHAyQ+EnisnVzp9oVsvSS8oiKLtNcBpoNRKcMRq2dGdypVNwPWfCe YT+UKV2BVmF864AtKiDZw/IXS9B1njbJv5uyaWGmU5PUUnaFl6pPABNzCVy9p+bR IFwPW7RUvjqaQl63qhAdwHUa6zjosLN/hH4/1PXP1DLH3i08YfFlT0Dx+EXeh7Jl XsCLYqzkP2KGj2bhwhTPN05SbQgnU6srQA4E4Rf67wgyLow6zR/f/0mKcl7fSmTA zxssi/JZXaxT8GckoTtHyZmlEK0gR4ZVHXdG+cJIKJVS04iy+vuDaKE30sNPdb8M iSTTa6tsqA== Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [128.224.246.37]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4e1cbvrc3v-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 08 May 2026 14:45:04 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.61; Fri, 8 May 2026 07:45:02 -0700 Received: from ala-lpggp3.wrs.com (10.11.232.110) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server id 15.1.2507.61 via Frontend Transport; Fri, 8 May 2026 07:45:02 -0700 From: To: Subject: [PATCH 2/3] nfs-utils: 2.8.7 -> 2.9.1 Date: Fri, 8 May 2026 07:45:00 -0700 Message-ID: <408e124b2d1340435c9c408879aa3ae8b966eef9.1778251103.git.liezhi.yang@windriver.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: ciAOXeOAMgOuQw2v0a3mqfS7FD7QV3gj X-Proofpoint-GUID: ciAOXeOAMgOuQw2v0a3mqfS7FD7QV3gj X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA4MDE1MCBTYWx0ZWRfXzvslcXd9w0vo M7r+X2cYAWe7Oa1z7qAtaI2T5jGm+Evh3n4k98oSZ81nZ5GhlkPjESQ5Yn9rFtXge80aV1waOeH uPRk0sUR7kbTjOJT5xqdYCqCn3a8LNB39iyjWMXyryqa3GFfaSoE1t+kjaAzpSOAjptVILDYew5 BgoVcJ38m38hsHnCM+6HiiO9emQ4U97WId5/33PCw9Jbb+fihzZdn3hAKgGl7fehY8tVUHrZeQ5 ZM8wfglAWEkCIxSKMCNuVA15dsnVYI4XaHLFRVSb+ZyWQmI5x7wEMn/C8MjGIMOdR2Pypb0ae/L P05COdMQOQQctWI7TBk9r8doJ7E8aCQ2dU9KLKNSlQv0dMcMhIywnLsg4FCRNw5c7G8p/D2qSlP skdDO7VA+uPTvK6h3lRYbEvonXOscYlM6iEwzoVuXTHEtDPn+B0oTQEakQ+oraVD2uQV/QOou09 dBPX+aLkgRVDC/r8gMw== X-Authority-Analysis: v=2.4 cv=U9iiy+ru c=1 sm=1 tr=0 ts=69fdf6f0 cx=c_pps a=Lg6ja3A245NiLSnFpY5YKQ==:117 a=Lg6ja3A245NiLSnFpY5YKQ==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=fTW__CHxibyLmBMfj2wP:22 a=t7CeM3EgAAAA:8 a=GqB59jVI8Mvp-EO1NFwA:9 a=FdTzh2GWekK77mhwV6Dw:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-07_02,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 priorityscore=1501 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605080150 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 May 2026 14:45:12 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236721 From: Robert Yang * Add libnl to DEPENDS to fix: configure: error: Package requirements (libnl-3.0 >= 3.1) were not met: Signed-off-by: Robert Yang --- .../nfs-utils/{nfs-utils_2.8.7.bb => nfs-utils_2.9.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-connectivity/nfs-utils/{nfs-utils_2.8.7.bb => nfs-utils_2.9.1.bb} (97%) diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.7.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb similarity index 97% rename from meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.7.bb rename to meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb index 7693a88682..39a747d344 100644 --- a/meta/recipes-connectivity/nfs-utils/nfs-utils_2.8.7.bb +++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_2.9.1.bb @@ -8,7 +8,7 @@ LICENSE = "MIT & GPL-2.0-or-later & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=95f3a93a5c3c7888de623b46ea085a84" # util-linux for libblkid -DEPENDS = "libcap libevent util-linux sqlite3 libtirpc libxml2" +DEPENDS = "libcap libevent util-linux sqlite3 libtirpc libxml2 libnl" RDEPENDS:${PN} = "netbase ${PN}-client" RRECOMMENDS:${PN} = "kernel-module-nfsd" @@ -25,7 +25,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x file://0005-find-OE-provided-Kerberos.patch \ " -SRC_URI[sha256sum] = "59d0f1e17b18efaa60ea3ccf89a9cad3217f8d3b23c18d2fe34b25c8969d60ae" +SRC_URI[sha256sum] = "302846343bf509f8f884c23bdbd0fe853b7f7cbb6572060a9082279d13b21a2c" # Only kernel-module-nfsd is required here (but can be built-in) - the nfsd module will # pull in the remainder of the dependencies. From patchwork Fri May 8 14:45:01 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Yang X-Patchwork-Id: 87751 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 005B8CD3445 for ; Fri, 8 May 2026 14:45:11 +0000 (UTC) Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.15478.1778251506346170087 for ; Fri, 08 May 2026 07:45:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@windriver.com header.s=PPS06212021 header.b=Ptzt7nTx; spf=permerror, err=parse error for token &{10 18 %{ir}.%{v}.%{d}.spf.has.pphosted.com}: invalid domain name (domain: windriver.com, ip: 205.220.178.238, mailfrom: prvs=9588382931=liezhi.yang@windriver.com) Received: from pps.filterd (m0250812.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 648B4eea470902 for ; Fri, 8 May 2026 14:45:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=PPS06212021; bh=PWQ+U0q/jCEwjoSSyhTTqVGp1fwc/7sn76fQtUjP5+I=; b=Ptzt7nTxlyFf 287VvqvN9u7NBUKP8VdbdjZ04lE8iDHFTK3WMSW+oaBeD2KXakWC7/B61Mj7y1vx 8ZjB7xhMpITVOWoq4mb15jCun+50D/cN1ub1Atk5hBb+yFPbVcImCG3RgIkmKoxt pzfyeUNeyfxuZkD26pK83JsvDpyZhgSsaX8lna1n26yZjjsrUgS3G3+7U29tHkXp vHmIJk+L51Qy6p6ek9lwo0Xa1VkGUSpbmPDGFjDF7A0+FtnDdMkxh/CQWTzJujbg kf1be7sn3ZNxn83lpyYMpYA1Qps8SD7xntCXAiimX2megXMYSzXCMw0CsrXanrdW EJpxSaiU5w== Received: from ala-exchng02.corp.ad.wrs.com (ala-exchng02.wrs.com [128.224.246.37]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 4e1cbvrc3v-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 08 May 2026 14:45:05 +0000 (GMT) Received: from ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.61; Fri, 8 May 2026 07:45:02 -0700 Received: from ala-lpggp3.wrs.com (10.11.232.110) by ALA-EXCHNG02.corp.ad.wrs.com (10.11.224.122) with Microsoft SMTP Server id 15.1.2507.61 via Frontend Transport; Fri, 8 May 2026 07:45:02 -0700 From: To: Subject: [PATCH 3/3] strace: upgrade 6.19 -> 7.0 Date: Fri, 8 May 2026 07:45:01 -0700 Message-ID: X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: uTFixUTUuTXYHpxxhhq-zqFstLVmn99j X-Proofpoint-GUID: uTFixUTUuTXYHpxxhhq-zqFstLVmn99j X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA4MDE1MCBTYWx0ZWRfXy11ueQq9OMWJ 4hUUC6R98wFmj757hlog9W3hGJ6Je0shFIQT+DgCXT5Ut7avWy7to7ND7lhv9emywFfdZ4+BrIr M7UE63fWwZpFBiuIUZ2nWRPiW9hfvdKH1lAzSTOCIsw/bXyU6fRHmwNEXR0k8Aul2gDW7GDYVdi yN2GmtgOVfkuHqMIOTk6QBkuA1oVe1j/H8xdk2r2wm59V60yfir/eXHmvL6taNaptbGzbtfsRWl DLPI3FwuHLISdjw0xsuw+k/8oirjrK+WVlqgBgHJyXa3mIRqaDetBWA0Tt8AJ482sMhwjRjZw2o TaU60utMyOyk/0YPXx0sdtQLQTPpbL9w/Vmq6F0/uc0QBq+jxz7Ipp1toQYDxL9NQ9nnKdwZL7R Wx19sKjooihNt2gCPN95XB6Rw3T/zonT1+YJHaPgQ22dIaoW+VwslwDLcH31rd3zoYJScM7Zkfe HPplCW1K8V9cLGX+HYg== X-Authority-Analysis: v=2.4 cv=U9iiy+ru c=1 sm=1 tr=0 ts=69fdf6f1 cx=c_pps a=Lg6ja3A245NiLSnFpY5YKQ==:117 a=Lg6ja3A245NiLSnFpY5YKQ==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=bi6dqmuHe4P4UrxVR6um:22 a=fTW__CHxibyLmBMfj2wP:22 a=VwQbUJbxAAAA:8 a=SEtKQCMJAAAA:8 a=5KEJ3k9QAAAA:8 a=NEAV23lmAAAA:8 a=t7CeM3EgAAAA:8 a=pGLkceISAAAA:8 a=EUspDBNiAAAA:8 a=fk1lIlRQAAAA:8 a=Sv4y0yS6AAAA:8 a=QyXUC8HyAAAA:8 a=ag1SF4gXAAAA:8 a=7CQSdrXTAAAA:8 a=F1FrAX9Z8nka8etqs78A:9 a=bD-j7InbQKcIWogN:21 a=kyTSok1ft720jgMXX5-3:22 a=olg2BfGzmf2haRflzj8J:22 a=FdTzh2GWekK77mhwV6Dw:22 a=U75ogvRika4pmaD_UPO0:22 a=I7ze7AG8jwQKfjVvUIqj:22 a=Yupwre4RP9_Eg_Bd0iYG:22 a=a-qgeE7W1pNrGK8U0ZQC:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-07_02,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 bulkscore=0 adultscore=0 spamscore=0 priorityscore=1501 phishscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605080150 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 08 May 2026 14:45:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/236722 From: Robert Yang Signed-off-by: Robert Yang --- ..._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 +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 +--- + 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 ++ + #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 +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 +--- + 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 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 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 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 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 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 Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -13,7 +13,7 @@ Signed-off-by: Anuj Mittal 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 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 +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 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 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