From: antznin <agodard@witekio.com>
Date: Wed, 29 Apr 2020 12:37:38 +0000 (+0200)
Subject: optee-os: Replace /lib by ${nonarch_base_libdir} in do_install
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a44d0e61e09ecefeee56403236e81a2f2eb0ab1d;p=meta-freescale.git

optee-os: Replace /lib by ${nonarch_base_libdir} in do_install

This fixes a do_package error when using `usrmerge` in
`DISTRO_FEATURES`. In that case the bin files should have been installed
in /usr/lib. Using ${nonarch_base_libdir} makes the location specific to
distro settings.

Signed-off-by: antznin <agodard@witekio.com>
---

diff --git a/recipes-security/optee-imx/optee-os_3.2.0.imx.bb b/recipes-security/optee-imx/optee-os_3.2.0.imx.bb
index 43b0ef14..f4fc26e7 100644
--- a/recipes-security/optee-imx/optee-os_3.2.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_3.2.0.imx.bb
@@ -71,8 +71,8 @@ do_deploy () {
 }
 
 do_install () {
-    install -d ${D}/lib/firmware/
-    install -m 644 ${B}/core/*.bin ${D}/lib/firmware/
+    install -d ${D}${nonarch_base_libdir}/firmware/
+    install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
 
     # Install the TA devkit
     install -d ${D}/usr/include/optee/export-user_ta_${OPTEE_ARCH}/