From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Fri, 18 Feb 2022 23:04:22 +0000 (-0600)
Subject: optee-test: Cleanup install and FILES
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=71e49a7aef4ed44f085de05f31fa3671a95b80f6;p=meta-freescale.git

optee-test: Cleanup install and FILES

- Use variables properly for the install and FILES
- Simplify the FILES update with an append

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---

diff --git a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb
index 7039d0c4..53951787 100644
--- a/recipes-security/optee-imx/optee-test_3.10.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_3.10.0.imx.bb
@@ -49,15 +49,15 @@ do_compile() {
 do_compile[cleandirs] = "${B}"
 
 do_install () {
-	install -d ${D}/usr/bin
-	install ${B}/xtest/xtest ${D}/usr/bin/
+	install -d ${D}${bindir}
+	install ${B}/xtest/xtest ${D}${bindir}
 
-	install -d ${D}/lib/optee_armtz
+	install -d ${D}${nonarch_base_libdir}/optee_armtz
 	find ${B}/ta -name '*.ta' | while read name; do
-		install -m 444 $name ${D}/lib/optee_armtz/
+		install -m 444 $name ${D}${nonarch_base_libdir}/optee_armtz/
 	done
 }
 
-FILES:${PN} = "/usr/bin/ /lib*/optee_armtz/"
+FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/"
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"