mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-02 13:59:59 +00:00
Code Issues Projects Releases Wiki Activity

bats: fix qa issue when multilib eanbled

Browse Source 
Fix qa issue for bats when multilib is enabled:

| ERROR: bats-1.3.0-r0 do_package: QA Issue: bats: Files/directories
     were installed but not shipped in any package:
|  /usr/lib
|  /usr/lib/bats-core
|  /usr/lib/bats-core/formatter.bash
|  /usr/lib/bats-core/test_functions.bash

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Kai Kang
2021-07-01 11:24:41 +08:00
committed by Khem Raj
parent 40ed8d14ab
commit e2a4d4add4
2 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-test/bats/bats_1.3.0.bb
+2 -1
View File
@@ -7,6 +7,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=2970203aedf9e829edb96a137a4fe81b"
SRC_URI = "git://github.com/bats-core/bats-core.git \
file://0001-install.sh-consider-multilib.patch \
"
# v1.3.0
SRCREV = "9086c47854652f2731861b40385689c85f12103f"
@@ -15,7 +16,7 @@ S = "${WORKDIR}/git"
do_install() {
# Just a bunch of bash scripts to install
${S}/install.sh ${D}${prefix}
${S}/install.sh ${D}${prefix} ${baselib}
}
RDEPENDS_${PN} = "bash"
meta-oe/recipes-test/bats/files/0001-install.sh-consider-multilib.patch
+43
View File
@@ -0,0 +1,43 @@
From 6e3d01f1ff199383b78a7504858c374fbce05f4e Mon Sep 17 00:00:00 2001
From: Kai Kang <kai.kang@windriver.com>
Date: Thu, 10 Jun 2021 11:11:07 +0800
Subject: [PATCH] install.sh: consider multilib
It may install files to /usr/lib64 when multilib is enabled. Add an
optional parameter for install.sh to support it.
Upstream-Status: Submitted [https://github.com/bats-core/bats-core/pull/452]
Signed-off-by: Kai Kang <kai.kang@windriver.com>
---
install.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/install.sh b/install.sh
index e660866..d91159e 100755
--- a/install.sh
+++ b/install.sh
@@ -4,6 +4,7 @@ set -e
BATS_ROOT="${0%/*}"
PREFIX="$1"
+BASELIB="${2:-lib}"
if [[ -z "$PREFIX" ]]; then
printf '%s\n' \
@@ -12,10 +13,10 @@ if [[ -z "$PREFIX" ]]; then
exit 1
fi
-install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,lib/bats-core,share/man/man{1,7}}
+install -d -m 755 "$PREFIX"/{bin,libexec/bats-core,${BASELIB}/bats-core,share/man/man{1,7}}
install -m 755 "$BATS_ROOT/bin"/* "$PREFIX/bin"
install -m 755 "$BATS_ROOT/libexec/bats-core"/* "$PREFIX/libexec/bats-core"
-install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/lib/bats-core"
+install -m 755 "$BATS_ROOT/lib/bats-core"/* "$PREFIX/${BASELIB}/bats-core"
install -m 644 "$BATS_ROOT/man/bats.1" "$PREFIX/share/man/man1"
install -m 644 "$BATS_ROOT/man/bats.7" "$PREFIX/share/man/man7"
--
2.17.1