From patchwork Tue Apr 16 06:14:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 44215 Return-Path: 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 B7EA8C07E8D for ; Tue, 16 Apr 2024 06:14:07 +0000 (UTC) Received: from a27-45.smtp-out.us-west-2.amazonses.com (a27-45.smtp-out.us-west-2.amazonses.com [54.240.27.45]) by mx.groups.io with SMTP id smtpd.web10.13599.1713248039971961011 for ; Mon, 15 Apr 2024 23:14:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=EMhDXvip; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=4DJdRvm9; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.45, mailfrom: 0101018ee58a7722-7af6291a-7380-4f0a-9500-2f39e3329d83-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1713248040; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=FaTpfWQ/tQqMRmG9RYsMMBChTuAQKYDJv/HWwQOmjPQ=; b=EMhDXvipZxp//pObjLAHG9NgxgAtLxlZUwZC3P6T7STXyxdNfOYCiq39ybDuRPmR 0R8lLXB2YDLEpisOUeYRW0wufZo/Xz+bg7msTKqV75K6J1JLxLEPphScd59SqF31iKv /8F4fDu5KIr1f2IMRv4MSyeCf5pdzqgJe7vGuv2M= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1713248040; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=FaTpfWQ/tQqMRmG9RYsMMBChTuAQKYDJv/HWwQOmjPQ=; b=4DJdRvm9/8lYvYg83ubpjMuSvevG10oK26QFIEn5KOol17ulR43eHj4MPp805atz 4049s33F7YmRjhe/c0NSpEpbXT9oNytMaDmP08TjQ7y6lVBmEvkM3jKvpZnLhLvOFLC +/D6aIaOnp5tsL3TGhEe6bShh97hNUkkz0WP7LD4= MIME-Version: 1.0 From: auh@yoctoproject.org To: Robert Yang Cc: openembedded-core@lists.openembedded.org Subject: [AUH] strace: upgrading to 6.8 SUCCEEDED Message-ID: <0101018ee58a7722-7af6291a-7380-4f0a-9500-2f39e3329d83-000000@us-west-2.amazonses.com> Date: Tue, 16 Apr 2024 06:14:00 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.04.16-54.240.27.45 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Apr 2024 06:14:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/198337 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *strace* to *6.8* has Succeeded. Next steps: - apply the patch: git am 0001-strace-upgrade-6.7-6.8.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 2749d9a7ffdb26be285a1e08291380fa56b41174 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Mon, 15 Apr 2024 21:22:04 +0000 Subject: [PATCH] strace: upgrade 6.7 -> 6.8 --- ...toconf-macro-to-detect-largefile-sup.patch | 6 +- ...001-strace-fix-reproducibilty-issues.patch | 9 +-- ...002-tests-Replace-off64_t-with-off_t.patch | 35 ++++++---- .../strace/strace/Makefile-ptest.patch | 9 ++- .../strace/strace/ptest-spacesave.patch | 7 +- .../strace/strace/skip-load.patch | 9 +-- .../strace/strace/update-gawk-paths.patch | 70 ++++++++++--------- .../strace/{strace_6.7.bb => strace_6.8.bb} | 2 +- 8 files changed, 76 insertions(+), 71 deletions(-) rename meta/recipes-devtools/strace/{strace_6.7.bb => strace_6.8.bb} (96%) 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 76ca7a76a8..2028fe2b4a 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 470399f3636c412b74f9daf6ae430b13c3126f02 Mon Sep 17 00:00:00 2001 +From da3f5dfbb3e65a30e9c1a1559579688ed0870d83 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,10 +13,10 @@ Signed-off-by: Khem Raj 1 file changed, 2 insertions(+) diff --git a/configure.ac b/configure.ac -index 4797b42dd..7d57fb254 100644 +index 36fff90..9e40ab5 100644 --- a/configure.ac +++ b/configure.ac -@@ -43,6 +43,8 @@ AC_PROG_INSTALL +@@ -42,6 +42,8 @@ AC_PROG_INSTALL AC_PROG_RANLIB AC_PROG_LN_S 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 c4c176e6bc..0be22ff105 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 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001 +From 39db6fa4744472c20580f8384e1bbee49e3b1bba 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 @@ -13,7 +13,7 @@ Signed-off-by: Jeremy Puhlman 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index 5e1e7c9..1e65eac 100755 +index 8f47651..65267db 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh @@ -46,7 +46,7 @@ while read -r name arg0 args; do { @@ -25,7 +25,7 @@ index 5e1e7c9..1e65eac 100755 case "$arg0" in +*) -@@ -80,7 +80,7 @@ while read -r name arg0 args; do { +@@ -91,7 +91,7 @@ while read -r name arg0 args; do { if [ -n "$names" ]; then { @@ -34,6 +34,3 @@ index 5e1e7c9..1e65eac 100755 printf 'GEN_TESTS =' printf ' %s.gen.test' $names echo --- -2.24.1 - 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 0cabdfe99f..e9cd3dbb87 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 579b2ebe52d4b97f954e6188df2d07e137820075 Mon Sep 17 00:00:00 2001 +From 8790704100426b0b93ffefdfbd0c6c0e288ced90 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 @@ -10,9 +10,12 @@ Upstream-Status: Submitted [https://github.com/strace/strace/pull/230] Signed-off-by: Khem Raj --- tests/readahead.c | 2 +- + tests/sync_file_range.c | 4 ++-- tests/sync_file_range2.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 3 files changed, 5 insertions(+), 5 deletions(-) +diff --git a/tests/readahead.c b/tests/readahead.c +index 1072378..b9597e6 100644 --- a/tests/readahead.c +++ b/tests/readahead.c @@ -42,7 +42,7 @@ static const int fds[] = { @@ -24,29 +27,33 @@ Signed-off-by: Khem Raj -0x8000000000000000LL, -0x5060708090a0b0c0LL, -1LL, ---- a/tests/sync_file_range2.c -+++ b/tests/sync_file_range2.c +diff --git a/tests/sync_file_range.c b/tests/sync_file_range.c +index e93ab6c..dc76865 100644 +--- a/tests/sync_file_range.c ++++ b/tests/sync_file_range.c @@ -20,8 +20,8 @@ int main(void) { const int fd = -1; -- const off64_t offset = 0xdeadbeefbadc0ded; -- const off64_t nbytes = 0xfacefeedcafef00d; -+ const off_t offset = 0xdeadbeefbadc0ded; -+ const off_t nbytes = 0xfacefeedcafef00d; +- const off64_t offset = 0xdeadbeefbadc0dedULL; +- const off64_t nbytes = 0xfacefeedcafef00dULL; ++ const off_t offset = 0xdeadbeefbadc0dedULL; ++ const off_t nbytes = 0xfacefeedcafef00dULL; const unsigned int flags = -1; int rc = sync_file_range(fd, offset, nbytes, flags); ---- a/tests/sync_file_range.c -+++ b/tests/sync_file_range.c +diff --git a/tests/sync_file_range2.c b/tests/sync_file_range2.c +index b8dc712..e4b003c 100644 +--- a/tests/sync_file_range2.c ++++ b/tests/sync_file_range2.c @@ -20,8 +20,8 @@ int main(void) { const int fd = -1; -- const off64_t offset = 0xdeadbeefbadc0dedULL; -- const off64_t nbytes = 0xfacefeedcafef00dULL; -+ const off_t offset = 0xdeadbeefbadc0dedULL; -+ const off_t nbytes = 0xfacefeedcafef00dULL; +- const off64_t offset = 0xdeadbeefbadc0ded; +- const off64_t nbytes = 0xfacefeedcafef00d; ++ const off_t offset = 0xdeadbeefbadc0ded; ++ const off_t nbytes = 0xfacefeedcafef00d; const unsigned int flags = -1; int rc = sync_file_range(fd, offset, nbytes, flags); diff --git a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch index 9af7737662..e7719b5303 100644 --- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch +++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch @@ -1,4 +1,4 @@ -From 1f50e0a09d828be8f5b1f28db9af0b12492a1553 Mon Sep 17 00:00:00 2001 +From 2fea3b32a9debb2d4b335c481b4d0802317a02b0 Mon Sep 17 00:00:00 2001 From: Gabriel Barbu Date: Thu, 25 Jul 2013 15:28:33 +0200 Subject: [PATCH] strace: Add ptest @@ -8,16 +8,15 @@ Upstream-Status: Inappropriate Signed-off-by: Gabriel Barbu Signed-off-by: Chong Lu Signed-off-by: Anuj Mittal - --- tests/Makefile.am | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am -index 55566ee..a7ae6f9 100644 +index ef68898..735b73d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am -@@ -16,6 +16,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ +@@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@ MPERS_NAME = MPERS_CC_FLAGS = ARCH_MFLAGS = @@ -25,7 +24,7 @@ index 55566ee..a7ae6f9 100644 AM_CFLAGS = $(WARN_CFLAGS) bundled_CPPFLAGS = if USE_BUNDLED_HEADERS -@@ -703,3 +704,22 @@ BUILT_SOURCES = ksysent.h +@@ -889,3 +890,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 4e86ccadc5..7d22da9f38 100644 --- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch +++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch @@ -1,4 +1,4 @@ -From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001 +From c5db0243c787e023104ea04880b0167bdbd474b9 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 @@ -9,16 +9,15 @@ using around 600MB of disk space and running our ptest images out of space. RP 2019/5/29 Upstream-Status: Inappropriate [specific to OE image space issues] - --- tests/gen_tests.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh -index 3540204..5e1e7c9 100755 +index ce1467e..8f47651 100755 --- a/tests/gen_tests.sh +++ b/tests/gen_tests.sh -@@ -62,6 +62,7 @@ while read -r name arg0 args; do { +@@ -73,6 +73,7 @@ while read -r name arg0 args; do { $hdr . "\${srcdir=.}/init.sh" run_strace_match_diff $arg0 $args diff --git a/meta/recipes-devtools/strace/strace/skip-load.patch b/meta/recipes-devtools/strace/strace/skip-load.patch index b1acfda5d8..cdc897fc14 100644 --- a/meta/recipes-devtools/strace/strace/skip-load.patch +++ b/meta/recipes-devtools/strace/strace/skip-load.patch @@ -1,9 +1,13 @@ +From c85fdbe795733fde6506745499f23980c70c72c5 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 31 Jan 2022 17:40:13 +0000 +Subject: [PATCH] strace: skip a number of load-sensitive tests + Skip tests which are known to be unreliable under load, typically because they care about timing. Upstream-Status: Inappropriate Signed-off-by: Ross Burton - --- tests/clock_nanosleep.gen.test | 1 + tests/delay.test | 1 + @@ -44,6 +48,3 @@ index 8299737..d89c7df 100755 r_opt="${1:--r}" --- -2.25.1 - diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch index a16ede95c2..efe8b1f082 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 4cd26cfaec255ec87f22abe886e0be89312a9671 Mon Sep 17 00:00:00 2001 +From 95bcc8a6f2ae7388832572a2689c26994aa7b88f 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 @@ -11,22 +11,24 @@ from #!/bin/gawk to #!/usr/bin/gawk. Fixes missing RDPENDS QA tests: Upstream-Status: Inappropriate [configuration] Signed-off-by: Andre McCurdy - --- src/mpers.awk | 2 +- + tests-m32/caps-abbrev.awk | 2 +- tests-m32/caps.awk | 2 +- tests-m32/match.awk | 2 +- tests-m32/rt_sigaction.awk | 2 +- + tests-mx32/caps-abbrev.awk | 2 +- tests-mx32/caps.awk | 2 +- tests-mx32/match.awk | 2 +- tests-mx32/rt_sigaction.awk | 2 +- + tests/caps-abbrev.awk | 2 +- tests/caps.awk | 2 +- tests/match.awk | 2 +- tests/rt_sigaction.awk | 2 +- - 10 files changed, 10 insertions(+), 10 deletions(-) + 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/mpers.awk b/src/mpers.awk -index 25a212f..b2ff53f 100644 +index 425ab65..33ece5c 100644 --- a/src/mpers.awk +++ b/src/mpers.awk @@ -1,4 +1,4 @@ @@ -35,6 +37,16 @@ index 25a212f..b2ff53f 100644 # # Copyright (c) 2015 Elvira Khabirova # Copyright (c) 2015-2016 Dmitry V. Levin +diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk +index e8393fd..76c4e51 100644 +--- a/tests-m32/caps-abbrev.awk ++++ b/tests-m32/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # diff --git a/tests-m32/caps.awk b/tests-m32/caps.awk index 69500ec..e5dfd87 100644 --- a/tests-m32/caps.awk @@ -65,6 +77,16 @@ index dce78f5..573d9ea 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin # Copyright (c) 2016 Elvira Khabirova +diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk +index e8393fd..76c4e51 100644 +--- a/tests-mx32/caps-abbrev.awk ++++ b/tests-mx32/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # diff --git a/tests-mx32/caps.awk b/tests-mx32/caps.awk index 69500ec..e5dfd87 100644 --- a/tests-mx32/caps.awk @@ -95,6 +117,16 @@ index dce78f5..573d9ea 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin # Copyright (c) 2016 Elvira Khabirova +diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk +index e8393fd..76c4e51 100644 +--- a/tests/caps-abbrev.awk ++++ b/tests/caps-abbrev.awk +@@ -1,4 +1,4 @@ +-#!/bin/gawk ++#!/usr/bin/gawk + # + # This file is part of caps strace test. + # diff --git a/tests/caps.awk b/tests/caps.awk index 69500ec..e5dfd87 100644 --- a/tests/caps.awk @@ -125,33 +157,3 @@ index dce78f5..573d9ea 100644 # # Copyright (c) 2014-2015 Dmitry V. Levin # Copyright (c) 2016 Elvira Khabirova -diff --git a/tests-m32/caps-abbrev.awk b/tests-m32/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests-m32/caps-abbrev.awk -+++ b/tests-m32/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # -diff --git a/tests-mx32/caps-abbrev.awk b/tests-mx32/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests-mx32/caps-abbrev.awk -+++ b/tests-mx32/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # -diff --git a/tests/caps-abbrev.awk b/tests/caps-abbrev.awk -index c00023b..a56cd56 100644 ---- a/tests/caps-abbrev.awk -+++ b/tests/caps-abbrev.awk -@@ -1,4 +1,4 @@ --#!/bin/gawk -+#!/usr/bin/gawk - # - # This file is part of caps strace test. - # diff --git a/meta/recipes-devtools/strace/strace_6.7.bb b/meta/recipes-devtools/strace/strace_6.8.bb similarity index 96% rename from meta/recipes-devtools/strace/strace_6.7.bb rename to meta/recipes-devtools/strace/strace_6.8.bb index f365477ccd..b22c57b45d 100644 --- a/meta/recipes-devtools/strace/strace_6.7.bb +++ b/meta/recipes-devtools/strace/strace_6.8.bb @@ -15,7 +15,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \ file://0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch \ file://0002-tests-Replace-off64_t-with-off_t.patch \ " -SRC_URI[sha256sum] = "2090201e1a3ff32846f4fe421c1163b15f440bb38e31355d09f82d3949922af7" +SRC_URI[sha256sum] = "ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149" inherit autotools ptest