From: Joe Slater <joe.sla...@windriver.com>

Use sed to change scripts to reference ${baselib}.  The
former set of scripts modified was incomplete.

Signed-off-by: Joe Slater <joe.sla...@windriver.com>
---
 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 a642d7cf5d..015bc42f82 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() {
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#102658): 
https://lists.openembedded.org/g/openembedded-devel/message/102658
Mute This Topic: https://lists.openembedded.org/mt/98992967/21656
Group Owner: openembedded-devel+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to