]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
strace: Fix the ptest path to test-driver
authorOla x Nilsson <olani@axis.com>
Wed, 13 Nov 2024 14:45:46 +0000 (15:45 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 14 Nov 2024 11:56:44 +0000 (11:56 +0000)
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 <olani@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/strace/strace_6.11.bb

index 4ab78e7a9b92de93126feeea5e190707b5792e8b..1bc8aa99e71a16cf0fba19815d8499805d469fb4 100644 (file)
@@ -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"