From 1da242af42a5a88cd2527bf829570d6f10b27010 Mon Sep 17 00:00:00 2001
From: antznin <agodard@witekio.com>
Date: Wed, 29 Apr 2020 14:37:38 +0200
Subject: [PATCH] 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>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Change-Id: I9d6c015975b093f74f29927a7e8bdfd87fd3dc09
---
 recipes-security/optee-imx/optee-os_3.2.0.imx.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 ba903519..06563a18 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
@@ -73,8 +73,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}/
-- 
2.40.1