From a540cf556cc9b16b7e7c229766b7082c780a1c83 Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Wed, 13 Nov 2024 15:45:43 +0100 Subject: attr: Fix the ptest path to test-driver 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] (From OE-Core rev: 289db96b441e01c4ba1bbcd76fcf52b3258f2613) Signed-off-by: Ola x Nilsson Signed-off-by: Richard Purdie --- meta/recipes-support/attr/attr.inc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'meta') diff --git a/meta/recipes-support/attr/attr.inc b/meta/recipes-support/attr/attr.inc index 6033934401..5d6929fe50 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} } -- cgit v1.2.3-54-g00ecf