From: Ola x Nilsson <[email protected]>

Add a sed substitution for ${PTEST_PATH}/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]
---
 meta/recipes-support/attr/attr.inc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-support/attr/attr.inc 
b/meta/recipes-support/attr/attr.inc
index 60339344015..5d6929fe507 100644
--- a/meta/recipes-support/attr/attr.inc
+++ b/meta/recipes-support/attr/attr.inc
@@ -42,10 +42,13 @@ do_install_ptest() {
             -e 's:${BASE_WORKDIR}/${MULTIMACH_TARGET_SYS}::g' \
             -i ${D}${PTEST_PATH}/Makefile
 
-        sed -i "s|^srcdir =.*|srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
-        sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" ${D}${PTEST_PATH}/Makefile
-        sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = \.\.|g" 
${D}${PTEST_PATH}/Makefile
-        sed -i "s|^Makefile:.*|Makefile:|g" ${D}${PTEST_PATH}/Makefile
+       sed -e "s|^srcdir =.*|srcdir = .|" \
+           -e "s|^abs_srcdir =.*|abs_srcdir = .|" \
+           -e "s|^abs_top_srcdir =.*|abs_top_srcdir = ..|" \
+           -e "s|^Makefile:.*|Makefile:|" \
+           -e "/^TEST_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
+           -i ${D}${PTEST_PATH}/Makefile
+
        cp -rf ${S}/build-aux/ ${D}${PTEST_PATH}
        cp -rf ${S}/test/ ${D}${PTEST_PATH}
 }
-- 
2.39.5

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#206933): 
https://lists.openembedded.org/g/openembedded-core/message/206933
Mute This Topic: https://lists.openembedded.org/mt/109511695/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to