From 9fd2cedee648aec4d237fd3375cf66ab4b81f8c9 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Mon, 22 May 2023 11:52:55 -0700 Subject: bats: use baselib Use sed to change scripts to reference ${baselib}. The former set of scripts modified was incomplete. Signed-off-by: Joe Slater Signed-off-by: Khem Raj (cherry picked from commit 1cc72c41af0c6a55a10be9158a2f856b02a56282) Signed-off-by: Armin Kuster --- meta-oe/recipes-test/bats/bats_1.9.0.bb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-test/bats/bats_1.9.0.bb b/meta-oe/recipes-test/bats/bats_1.9.0.bb index a642d7cf5..015bc42f8 100644 --- a/meta-oe/recipes-test/bats/bats_1.9.0.bb +++ b/meta-oe/recipes-test/bats/bats_1.9.0.bb @@ -15,10 +15,12 @@ SRCREV = "6636e2c2ef5ffe361535cb45fc61682c5ef46b71" S = "${WORKDIR}/git" +# Numerous scripts assume ${baselib} == lib, which is not true. +# do_configure:prepend() { - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-file - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-exec-test + for f in ${S}/libexec/bats-core/* ${S}/lib/bats-core/* ; do + sed -i 's:\$BATS_ROOT/lib/:\$BATS_ROOT/${baselib}/:g' $f + done } do_install() { -- cgit v1.2.3-54-g00ecf