From 953a4530383cc23ddc83f60bfacadc580d7c50cc Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Wed, 13 Nov 2024 15:25:21 +0100 Subject: librelp: Fix the ptest path to test-driver Add a sed substitution for ${PTEST_PATH}/${TESTDIR}/Makefile that transforms SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver to SH_LOG_DRIVER = $(SHELL) $(top_builddir)/test-driver which is where the test-driver script can be found when installed. The addition of this substition makes ptests work with or without an automake patch in OE-Core that does the same thing. Relates to [YOCTO #15635] Signed-off-by: Ola x Nilsson Signed-off-by: Khem Raj --- meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb index 49847047ac..65b5c8476f 100644 --- a/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb +++ b/meta-oe/recipes-extended/rsyslog/librelp_1.11.0.bb @@ -59,14 +59,16 @@ do_install_ptest() { # some tests need to write to this directory chmod 777 -R ${D}${PTEST_PATH}/${TESTDIR} - # do NOT need to rebuild Makefile or $(check_PROGRAMS) - sed -i 's/^Makefile:.*$/Makefile:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - sed -i 's/^check-TESTS:.*$/check-TESTS:/' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - - # fix the srcdir, top_srcdir, abs_top_builddir - sed -i 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - sed -i 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' ${D}${PTEST_PATH}/${TESTDIR}/Makefile - sed -i 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' ${D}${PTEST_PATH}/${TESTDIR}/Makefile + sed -e '# do NOT need to rebuild Makefile or $(check_PROGRAMS)' \ + -e 's/^Makefile:.*$/Makefile:/' \ + -e 's/^check-TESTS:.*$/check-TESTS:/' \ + -e '# fix the srcdir, top_srcdir, abs_top_builddir' \ + -e 's,^\(srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' \ + -e 's,^\(top_srcdir = \).*,\1${PTEST_PATH}/${TESTDIR},' \ + -e 's,^\(abs_top_builddir = \).*,\1${PTEST_PATH}/,' \ + -e '# fix the path to test-driver' \ + -e '/^SH_LOG_DRIVER =/s/(top_srcdir)/(top_builddir)/' \ + -i ${D}${PTEST_PATH}/${TESTDIR}/Makefile # install test-driver install -m 644 ${S}/test-driver ${D}${PTEST_PATH} -- cgit v1.2.3-54-g00ecf