From cfa585b93192222904ca99b7533d21726089b11c Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Wed, 13 Nov 2024 15:45:46 +0100 Subject: [PATCH] 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] Signed-off-by: Ola x Nilsson Signed-off-by: Richard Purdie --- meta/recipes-devtools/strace/strace_6.11.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/strace/strace_6.11.bb b/meta/recipes-devtools/strace/strace_6.11.bb index 4ab78e7a9b9..1bc8aa99e71 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() { mkdir -p ${D}${PTEST_PATH}/src install -m 755 ${S}/build-aux/test-driver ${D}${PTEST_PATH}/build-aux/ install -m 644 ${B}/src/config.h ${D}${PTEST_PATH}/src/ - sed -i -e '/^src/s/strace.*[0-9]/ptest/' ${D}/${PTEST_PATH}/${TESTDIR}/Makefile + sed -e '/^src/s/strace.*[0-9]/ptest/' \ + -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \ + -i ${D}/${PTEST_PATH}/${TESTDIR}/Makefile } RDEPENDS:${PN}-ptest += "make coreutils grep gawk sed locale-base-en-us" -- 2.47.3