From fda178ace0f4acad931c69300f6af54556472a06 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 9 Mar 2021 14:26:12 +0000 Subject: ltp: Fix determinism issue There was still a remaining issue with reporoducibility based upon the make version from the host system. Some versions added whitespace for XXX+= (e.g. 4.1) and some versions do not (e.g. 4.3). Replace the determinism patches with those submitted upstream both for this issue and the previous one. The LC_ALL setting for sort is dropped as it didn't fix an issue as hoped. Signed-off-by: Richard Purdie --- ...testsuite-generate-makefiles.sh-Avoid-inc.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch (limited to 'meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch') diff --git a/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch b/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch new file mode 100644 index 0000000000..c2a70dcb67 --- /dev/null +++ b/meta/recipes-extended/ltp/ltp/0001-open_posix_testsuite-generate-makefiles.sh-Avoid-inc.patch @@ -0,0 +1,40 @@ +From 2d1d6350af1db28ec520e26d0069a0518950b0a1 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Tue, 9 Mar 2021 15:21:11 +0000 +Subject: [PATCH 1/3] open_posix_testsuite/generate-makefiles.sh: Avoid + inconsistencies with make version + +With make 4.1, INSTALL_TARGETS+= will add a space to the variable whereas +with make 4.3, it will not. This leads to differing run.sh files in installed +in packages which is undesireable. If tests is empty we don't have to add +the line to the makefiles at all which seems like the easiest way to +avoid the differences in make behaviour. + +Signed-off-by: Richard Purdie +Upstream-Status: Submitted [http://lists.linux.it/pipermail/ltp/2021-March/021386.html] + +--- + .../open_posix_testsuite/scripts/generate-makefiles.sh | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +index 200a631db..4b3aaa4a0 100755 +--- a/testcases/open_posix_testsuite/scripts/generate-makefiles.sh ++++ b/testcases/open_posix_testsuite/scripts/generate-makefiles.sh +@@ -148,8 +148,12 @@ EOF + + fi + +- cat >> "$makefile.2" <> "$makefile.2" <> "$makefile.2" <