]> 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:51:53 +0000 (08:51 -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>
recipes-security/optee-imx/optee-os_3.2.0.imx.bb

index 43b0ef14e260bcfa12097902b9324567e50a24d7..f4fc26e776e41a33ef96a8e5e5c0893b8350a9ac 100644 (file)
@@ -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}/