]> code.ossystems Code Review - meta-freescale.git/commitdiff
optee-os: Replace /lib by ${nonarch_base_libdir} in do_install
authorantznin <agodard@witekio.com>
Wed, 29 Apr 2020 12:37:38 +0000 (14:37 +0200)
committerOtavio Salvador <otavio@ossystems.com.br>
Tue, 5 May 2020 11:50:50 +0000 (08:50 -0300)
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

index ba903519a3f9e320ea7c3f120310d9199b0e40da..06563a18bb8936e08aab3aef1a4922bb443a9694 100644 (file)
@@ -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}/