From 34ec975313003c83ab9dbbe8c698aa750fa08354 Mon Sep 17 00:00:00 2001 From: Sakib Sajal Date: Fri, 17 Sep 2021 19:13:00 -0400 Subject: bats: source files from correct directory Files are installed in ${baselib} directory when multilib is enabled and not in the hardcoded lib directory making it fail to source bats-core files. Parameterize the libdir such that the files are sources correctly. Signed-off-by: Sakib Sajal Signed-off-by: Khem Raj --- meta-oe/recipes-test/bats/bats_1.4.1.bb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-oe/recipes-test/bats/bats_1.4.1.bb b/meta-oe/recipes-test/bats/bats_1.4.1.bb index b30055549..30e83457c 100644 --- a/meta-oe/recipes-test/bats/bats_1.4.1.bb +++ b/meta-oe/recipes-test/bats/bats_1.4.1.bb @@ -14,6 +14,12 @@ SRCREV = "54e965fa9d269c2b3ff9036d81f32bac3df0edea" S = "${WORKDIR}/git" +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 +} + do_install() { # Just a bunch of bash scripts to install ${S}/install.sh ${D}${prefix} ${baselib} -- cgit v1.2.3-54-g00ecf