diff options
| author |   Jeremy Puhlman <jpuhlman@mvista.com> | 2020-03-11 15:25:41 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-12 22:49:23 +0000 |
| commit | 9e2db0ab1d4cacedde59e8915dff9a091e1c2d2b (patch) | |
| tree | f23820d63d0dbe26999b9294958a0c19feb1198b /meta/recipes-devtools/strace | |
| parent | c82076d68bc95b6f9e3f125bba44b4dbaee444bf (diff) | |
| download | openembedded-core-contrib-9e2db0ab1d4cacedde59e8915dff9a091e1c2d2b.tar.gz | |
strace: Fix reproducibility issues
gen_tests script encodes its full path to itself in each script
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.patch | 39 | ||||
| -rw-r--r-- | meta/recipes-devtools/strace/strace_5.5.bb | 1 |
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 @@ +From 6309792c49ca900cec6a7f1dc5b51bf75b629e11 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 + +The full path to the gen_tests.sh script is encoded in the tests + +Upstream-Status: Pending + +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> +--- + tests/gen_tests.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gen_tests.sh b/tests/gen_tests.sh +index 5e1e7c9..1e65eac 100755 +--- a/tests/gen_tests.sh ++++ b/tests/gen_tests.sh +@@ -46,7 +46,7 @@ while read -r name arg0 args; do { + + hdr="\ + #!/bin/sh -efu +-# Generated by $0 from $input ($name $arg0 $args); do not edit." ++# Generated by $(basename $0) from $input ($name $arg0 $args); do not edit." + + case "$arg0" in + +*) +@@ -80,7 +80,7 @@ while read -r name arg0 args; do { + + if [ -n "$names" ]; then + { +- printf '# Generated by %s from %s; do not edit.\n' "$0" "$input" ++ printf '# Generated by %s from %s; do not edit.\n' "$(basename $0)" "$input" + printf 'GEN_TESTS =' + printf ' %s.gen.test' $names + echo +-- +2.24.1 + 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 \ file://0001-caps-abbrev.awk-fix-gawk-s-path.patch \ file://ptest-spacesave.patch \ file://uintptr_t.patch \ + file://0001-strace-fix-reproducibilty-issues.patch \ " SRC_URI[md5sum] = "dbce2e84632b39a4ed86b9fc60447af9" SRC_URI[sha256sum] = "9f58958c8e59ea62293d907d10572e352b582bd7948ed21aa28ebb47e5bf30ff" |