From 6bcb03ca25fd3fcbb2da7063148f1d877b5de585 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Thu, 18 May 2023 08:02:44 -0700 Subject: [PATCH] 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: Gyorgy Sarvari --- meta-oe/recipes-test/bats/bats_1.6.1.bb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta-oe/recipes-test/bats/bats_1.6.1.bb b/meta-oe/recipes-test/bats/bats_1.6.1.bb index 3dcb51972d..3f0f575c72 100644 --- a/meta-oe/recipes-test/bats/bats_1.6.1.bb +++ b/meta-oe/recipes-test/bats/bats_1.6.1.bb @@ -15,11 +15,12 @@ SRCREV = "1977254c2a7faa2e0af17355856f91dc471d1daa" 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 - sed -i 's:\$BATS_ROOT/lib:\$BATS_ROOT/${baselib}:g' ${S}/libexec/bats-core/bats-format-pretty + 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() {