diff mbox series

[38/45] strace: upgrade 7.0 -> 7.1

Message ID 20260706171701.70536-38-alex.kanavin@gmail.com
State New
Headers show
Series [01/45] selftest/locales: opt out of ptests in DISTRO_FEATURES | expand

Commit Message

Alexander Kanavin July 6, 2026, 5:16 p.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

Tweak ptest Makefile to avoid make error due to an irrelevant missing file on target.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...nfigure-Use-autoconf-macro-to-detect-largefile-sup.patch | 2 +-
 .../0001-m4-Backport-ax_prog_cc_for_build.m4-macros.patch   | 2 +-
 .../strace/0001-strace-fix-reproducibilty-issues.patch      | 2 +-
 .../strace/0002-tests-Replace-off64_t-with-off_t.patch      | 2 +-
 meta/recipes-devtools/strace/strace/Makefile-ptest.patch    | 6 +++---
 meta/recipes-devtools/strace/strace/ptest-spacesave.patch   | 2 +-
 meta/recipes-devtools/strace/strace/skip-load.patch         | 6 +++---
 meta/recipes-devtools/strace/strace/update-gawk-paths.patch | 2 +-
 .../strace/{strace_7.0.bb => strace_7.1.bb}                 | 3 ++-
 9 files changed, 14 insertions(+), 13 deletions(-)
 rename meta/recipes-devtools/strace/{strace_7.0.bb => strace_7.1.bb} (95%)
diff mbox series

Patch

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 bda5156cdf..5a7d05ae41 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 36df82284b1e8c3d7338c315016a8e74c0978e32 Mon Sep 17 00:00:00 2001
+From 65fb22e302a4dbec675377e61593b52c2e291705 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
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 920c2e4faf..d3e35077de 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 dd821aebdefb3531202bcd51fce5e2bd74c1512d Mon Sep 17 00:00:00 2001
+From 77790a889ca5227936e2de2c587ef1fd9c8e718c 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 77f90bf0d1..78509da2b1 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 bb0cd804214054ef95193daa0b7076ed5be1c881 Mon Sep 17 00:00:00 2001
+From 455905ce2a3f886264e6344051654d7c2d9faf88 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 7daf3f6763..ec1905321a 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 2d6384cd2b6b923ea3eb6863beb0bfaf6bf628c2 Mon Sep 17 00:00:00 2001
+From 447203bdced57a521534c4fb7d1962318a81c1bd 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 3d23e34244..d864b68fc1 100644
--- a/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+++ b/meta/recipes-devtools/strace/strace/Makefile-ptest.patch
@@ -1,4 +1,4 @@ 
-From 21747b62c36689b68fac7e987a9b93b998f692e3 Mon Sep 17 00:00:00 2001
+From 6f9eb5907fa2a7d6127737e41fb4e9fb5fb091d3 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 7d80e07..1e0e064 100644
+index f37d053..975f878 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
 @@ -18,6 +18,7 @@ SIZEOF_LONG = @SIZEOF_LONG@
@@ -24,7 +24,7 @@  index 7d80e07..1e0e064 100644
  AM_CFLAGS = $(WARN_CFLAGS) $(TEST_WARN_CFLAGS)
  bundled_CPPFLAGS =
  if USE_BUNDLED_HEADERS
-@@ -950,3 +951,22 @@ BUILT_SOURCES = ksysent.h
+@@ -967,3 +968,22 @@ check-valgrind-local: $(check_LIBRARIES) $(check_PROGRAMS)
  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 14ad35be74..33f9c86894 100644
--- a/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
+++ b/meta/recipes-devtools/strace/strace/ptest-spacesave.patch
@@ -1,4 +1,4 @@ 
-From 0b3d278fa808a21d4300a71d062807f905671bf9 Mon Sep 17 00:00:00 2001
+From 868dff21f47036dec4db603129d46d4f8ea4a29d 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-load.patch b/meta/recipes-devtools/strace/strace/skip-load.patch
index dc88706948..1bdcb77ddb 100644
--- a/meta/recipes-devtools/strace/strace/skip-load.patch
+++ b/meta/recipes-devtools/strace/strace/skip-load.patch
@@ -1,4 +1,4 @@ 
-From 7fc69711b5e216c385b22a5b64c6c7c8be693600 Mon Sep 17 00:00:00 2001
+From 537e44aa0204590171936eec0fcd279b74fbbfee 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
@@ -49,7 +49,7 @@  index 41928de..f8a87cb 100755
 +skip_ "Test not reliable under load"
  run_strace_match_diff -a20 
 diff --git a/tests/strace-r.test b/tests/strace-r.test
-index 8299737..e894234 100755
+index a85558d..9ae9677 100755
 --- a/tests/strace-r.test
 +++ b/tests/strace-r.test
 @@ -9,6 +9,7 @@
@@ -59,4 +59,4 @@  index 8299737..e894234 100755
 +skip_ "Test not reliable under load"
  r_opt="${1:--r}"
  
- run_prog ../sleep 0
+ run_prog ../sleep-timing 0 "$TIMING_FILE"
diff --git a/meta/recipes-devtools/strace/strace/update-gawk-paths.patch b/meta/recipes-devtools/strace/strace/update-gawk-paths.patch
index c47ca08dd4..a83eb49ba3 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 6bc97ed4e26ca4d275c10f5b4f56fc43a8e12925 Mon Sep 17 00:00:00 2001
+From 7066b2e49ddbde0379ca52cebeefeca4f80fb75b 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_7.0.bb b/meta/recipes-devtools/strace/strace_7.1.bb
similarity index 95%
rename from meta/recipes-devtools/strace/strace_7.0.bb
rename to meta/recipes-devtools/strace/strace_7.1.bb
index fa86f7bb4e..c4ca3a7f27 100644
--- a/meta/recipes-devtools/strace/strace_7.0.bb
+++ b/meta/recipes-devtools/strace/strace_7.1.bb
@@ -19,7 +19,7 @@  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] = "6c92419be3f2ec560b31728a4652217c59864c8642ba7b1b3771b1b013ad074b"
+SRC_URI[sha256sum] = "81743ecf2a5b44186b2f5038afdc8beda7e5c70aed15b4fbfbcc6e9ece24490f"
 
 inherit autotools github-releases ptest
 
@@ -51,6 +51,7 @@  do_install_ptest() {
 	sed -e 's/^srcdir = .*/srcdir = ..\/..\/ptest\/tests/' \
 	    -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
 	    -e '/^CC_FOR_BUILD/s/\s-std=gnu23//g' \
+            -e '/^_hide_from_automake/d' \
 	    -i ${D}/${PTEST_PATH}/${TESTDIR}/Makefile
 }