summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOla x Nilsson <olani@axis.com>2024-11-13 15:45:46 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-14 11:56:53 +0000
commitea0e5262c68e54bb380436b45c8cb3dd0834a216 (patch)
tree1299aea4cc5b36f4b882568fc80c20eec2c8a50e
parente255434b20c8c08418076fab0cf675193498e54d (diff)
downloadpoky-ea0e5262c68e54bb380436b45c8cb3dd0834a216.tar.gz
strace: Fix the ptest path to test-driver
Add a sed substitution for ${PTEST_PATH}/tests/Makefile that transforms TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver to TEST_LOG_DRIVER = $(SHELL) $(top_builddir)/build-aux/test-driver which is where the test-driver script can be found when installed. There used to be an oe-core automake patch to do this, but it broke non-ptest use of automake. Relates to [YOCTO #15635] (From OE-Core rev: cfa585b93192222904ca99b7533d21726089b11c) Signed-off-by: Ola x Nilsson <olani@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/strace/strace_6.11.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-devtools/strace/strace_6.11.bb b/meta/recipes-devtools/strace/strace_6.11.bb
index 4ab78e7a9b..1bc8aa99e7 100644
--- a/meta/recipes-devtools/strace/strace_6.11.bb
+++ b/meta/recipes-devtools/strace/strace_6.11.bb
@@ -45,7 +45,9 @@ do_install_ptest() {
45 mkdir -p ${D}${PTEST_PATH}/src 45 mkdir -p ${D}${PTEST_PATH}/src
46 install -m 755 ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ 46 install -m 755 ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/
47 install -m 644 ${B}/src/config.h ${D}${PTEST_PATH}/src/ 47 install -m 644 ${B}/src/config.h ${D}${PTEST_PATH}/src/
48 sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile 48 sed -e '/^src/s/strace.*[0-9]/ptest/' \
49 -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
50 -i ${D}/${PTEST_PATH}/${TESTDIR}/Makefile
49} 51}
50 52
51RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed locale-base-en-us" 53RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed locale-base-en-us"