mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

strace: upgrade 6.8 -> 6.9

Browse Source 
This patch is made by AUH and rebased the following patches:
0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
0001-strace-fix-reproducibilty-issues.patch
0002-tests-Replace-off64_t-with-off_t.patch
Makefile-ptest.patch
ptest-spacesave.patch
skip-load.patch
update-gawk-paths.patch

(From OE-Core rev: 5efe057e6cf0b5f217d9a5af0cec93b92435ad62)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2024-05-24 03:28:27 -07:00
committed by Richard Purdie
parent e16d690e77
commit 071db3ae8e
8 changed files with 77 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/strace/strace/0001-configure-Use-autoconf-macro-to-detect-largefile-sup.patch
+3 -3
View File
@@ -1,4 +1,4 @@
From 470399f3636c412b74f9daf6ae430b13c3126f02 Mon Sep 17 00:00:00 2001
From ec543417b8e1df7c71dfc4728313849d9ab669a6 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,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
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
meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
+3 -6
View File
@@ -1,4 +1,4 @@
From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001
From d5f681c2de834110de260f4d071c7bc1fb0d7564 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
@@ -13,7 +13,7 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
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
meta/recipes-devtools/strace/strace/0002-tests-Replace-off64_t-with-off_t.patch
+22 -15
View File
@@ -1,4 +1,4 @@
From 579b2ebe52d4b97f954e6188df2d07e137820075 Mon Sep 17 00:00:00 2001
From 1891db87da3b204c512f47155aaa4e692008f1bf 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
@@ -10,9 +10,12 @@ Upstream-Status: Submitted [https://github.com/strace/strace/pull/230]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
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,19 +27,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
-0x8000000000000000LL,
-0x5060708090a0b0c0LL,
-1LL,
--- 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 = 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/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
@@ -49,4 +41,19 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
+ const off_t nbytes = 0xfacefeedcafef00dULL;
const unsigned int flags = -1;
int rc = sync_file_range(fd, offset, nbytes, flags);
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 = 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);
meta/recipes-devtools/strace/strace/Makefile-ptest.patch
+4 -5
View File
@@ -1,4 +1,4 @@
From 1f50e0a09d828be8f5b1f28db9af0b12492a1553 Mon Sep 17 00:00:00 2001
From 245f6322cf64e562d3227dfac26ce93c905b0380 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
@@ -8,16 +8,15 @@ Upstream-Status: Inappropriate
Signed-off-by: Gabriel Barbu <gabriel.barbu@enea.com>
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
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
meta/recipes-devtools/strace/strace/ptest-spacesave.patch
+3 -4
View File
@@ -1,4 +1,4 @@
From 3fad4821d90cd264d1b94253b9cf4fdf5d4034b8 Mon Sep 17 00:00:00 2001
From cf77d301faf96cc892c6df0e19fccbf5853f249d 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
@@ -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
meta/recipes-devtools/strace/strace/skip-load.patch
+5 -4
View File
@@ -1,9 +1,13 @@
From 3af7272a3435fc79e5da729155480a346ccf2d44 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
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 <ross.burton@arm.com>
---
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
meta/recipes-devtools/strace/strace/update-gawk-paths.patch
+36 -34
View File
@@ -1,4 +1,4 @@
From 4cd26cfaec255ec87f22abe886e0be89312a9671 Mon Sep 17 00:00:00 2001
From 920ff2e0e838fae4fe49bf8e8fa093d5b2485677 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
@@ -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 <armccurdy@gmail.com>
---
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 <lineprinter0@gmail.com>
# Copyright (c) 2015-2016 Dmitry V. Levin <ldv@strace.io>
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 <ldv@strace.io>
# Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
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 <ldv@strace.io>
# Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
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 <ldv@strace.io>
# Copyright (c) 2016 Elvira Khabirova <lineprinter0@gmail.com>
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.
#
meta/recipes-devtools/strace/strace_6.8.bb → meta/recipes-devtools/strace/strace_6.9.bb
+1 -1
View File
@@ -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] = "ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149"
SRC_URI[sha256sum] = "da189e990a82e3ca3a5a4631012f7ecfd489dab459854d82d8caf6a865c1356a"
inherit autotools ptest