summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/strace
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-03-11 15:25:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-12 22:49:28 +0000
commit3d46c2d10d99769e7daf592c255e6d9eba8f1d8d (patch)
tree06bab0c16ed0be3a7fec15c260e0ab4575cd8d2c /meta/recipes-devtools/strace
parentdf97528d1918eeae2547c438f5372eb9c72cfd0f (diff)
downloadpoky-3d46c2d10d99769e7daf592c255e6d9eba8f1d8d.tar.gz
strace: Fix reproducibility issues
gen_tests script encodes its full path to itself in each script (From OE-Core rev: 9e2db0ab1d4cacedde59e8915dff9a091e1c2d2b) Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/strace')
-rw-r--r--meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch39
-rw-r--r--meta/recipes-devtools/strace/strace_5.5.bb1
2 files changed, 40 insertions, 0 deletions
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
new file mode 100644
index 0000000000..c4c176e6bc
--- /dev/null
+++ b/meta/recipes-devtools/strace/strace/0001-strace-fix-reproducibilty-issues.patch
@@ -0,0 +1,39 @@
1From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 Mon Sep 17 00:00:00 2001
2From: Jeremy Puhlman <jpuhlman@mvista.com>
3Date: Wed, 11 Mar 2020 19:56:55 +0000
4Subject: [PATCH] strace: fix reproducibilty issues
5
6The full path to the gen_tests.sh script is encoded in the tests
7
8Upstream-Status: Pending
9
10Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
11---
12 tests/gen_tests.sh | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh
16index 5e1e7c9..1e65eac 100755
17--- a/tests/gen_tests.sh
18+++ b/tests/gen_tests.sh
19@@ -46,7 +46,7 @@ while read -r name arg0 args; do {
20
21 hdr="\
22 #!/bin/sh -efu
23-# Generated by $0 from $input ($name $arg0 $args); do not edit."
24+# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit."
25
26 case "$arg0" in
27 +*)
28@@ -80,7 +80,7 @@ while read -r name arg0 args; do {
29
30 if [ -n "$names" ]; then
31 {
32- printf '# Generated by %s from %s; do not edit.\n' "$0" "$input"
33+ printf '# Generated by %s from %s; do not edit.\n' "$(basename $0)" "$input"
34 printf 'GEN_TESTS ='
35 printf ' %s.gen.test' $names
36 echo
37--
382.24.1
39
diff --git a/meta/recipes-devtools/strace/strace_5.5.bb b/meta/recipes-devtools/strace/strace_5.5.bb
index 6e7d63949d..ae552da028 100644
--- a/meta/recipes-devtools/strace/strace_5.5.bb
+++ b/meta/recipes-devtools/strace/strace_5.5.bb
@@ -13,6 +13,7 @@ SRC_URI = "https://strace.io/files/${PV}/strace-${PV}.tar.xz \
13 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ 13 file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \
14 file://ptest-spacesave.patch \ 14 file://ptest-spacesave.patch \
15 file://uintptr_t.patch \ 15 file://uintptr_t.patch \
16 file://0001-strace-fix-reproducibilty-issues.patch \
16 " 17 "
17SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" 18SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9"
18SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" 19SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff"