summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOla x Nilsson <olani@axis.com>2024-11-13 15:45:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-14 11:56:53 +0000
commite255434b20c8c08418076fab0cf675193498e54d (patch)
tree97c6ae378a7c926978e7c35228cd49b7899a2d79
parent3c17eca5dc06f14ffc34d57e85cca1ec20d6bf94 (diff)
downloadpoky-e255434b20c8c08418076fab0cf675193498e54d.tar.gz
parted: Fix the ptest path to test-driver
Add a sed substitution for ${PTEST_PATH}/tests/Makefile that transforms SH_LOG_DRIVER = $(SHELL) $(top_srcdir)/build-aux/test-driver to SH_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: e1274fd52c7d7a41af60f5f19ba2163dba3d973f) Signed-off-by: Ola x Nilsson <olani@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/parted/parted_3.6.bb16
1 files changed, 9 insertions, 7 deletions
diff --git a/meta/recipes-extended/parted/parted_3.6.bb b/meta/recipes-extended/parted/parted_3.6.bb
index a537ef74db..fae35815be 100644
--- a/meta/recipes-extended/parted/parted_3.6.bb
+++ b/meta/recipes-extended/parted/parted_3.6.bb
@@ -35,13 +35,15 @@ do_install_ptest() {
35 cp ${B}/tests/Makefile $t/tests/ 35 cp ${B}/tests/Makefile $t/tests/
36 mkdir $t/lib 36 mkdir $t/lib
37 cp ${B}/lib/config.h $t/lib 37 cp ${B}/lib/config.h $t/lib
38 sed -i "s|^VERSION.*|VERSION = ${PV}|g" $t/tests/Makefile 38 sed -e "s|^VERSION.*|VERSION = ${PV}|g" \
39 sed -i "s|^srcdir =.*|srcdir = \.|g" $t/tests/Makefile 39 -e "s|^srcdir =.*|srcdir = \.|g" \
40 sed -i "s|^abs_srcdir =.*|abs_srcdir = \.|g" $t/tests/Makefile 40 -e "s|^abs_srcdir =.*|abs_srcdir = \.|g" \
41 sed -i "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" $t/tests/Makefile 41 -e "s|^abs_top_srcdir =.*|abs_top_srcdir = "${PTEST_PATH}"|g" \
42 sed -i "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" $t/tests/Makefile 42 -e "s|^abs_top_builddir =.*|abs_top_builddir = "${PTEST_PATH}"|g" \
43 sed -i "s|^Makefile:.*|Makefile:|g" $t/tests/Makefile 43 -e "/^SH_LOG_DRIVER =/s|(top_srcdir)|(top_builddir)|" \
44 sed -i "/^BUILDINFO.*$/d" $t/tests/Makefile 44 -e "s|^Makefile:.*|Makefile:|g" \
45 -e "/^BUILDINFO.*$/d" \
46 -i $t/tests/Makefile
45 for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \ 47 for i in print-align print-max print-flags dup-clobber duplicate fs-resize; \
46 do cp ${B}/tests/.libs/$i $t/tests/; \ 48 do cp ${B}/tests/.libs/$i $t/tests/; \
47 done 49 done