From 049928e0f12aff9492b6894f1467c97c906dbd3b Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Wed, 13 Nov 2024 15:45:42 +0100 Subject: acl: 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: a951447ca3b51f77272381c8e0c5837671fabbbd) Signed-off-by: Ola x Nilsson Signed-off-by: Richard Purdie --- meta/recipes-support/attr/acl_2.3.2.bb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/meta/recipes-support/attr/acl_2.3.2.bb b/meta/recipes-support/attr/acl_2.3.2.bb index 6178473873..dd959a5051 100644 --- a/meta/recipes-support/attr/acl_2.3.2.bb +++ b/meta/recipes-support/attr/acl_2.3.2.bb @@ -52,10 +52,12 @@ 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 rm ${D}${PTEST_PATH}/.libs/libtestlookup.lai } -- cgit v1.2.3-54-g00ecf