From 844696e401bca5df7a06092c059d03ea71df9990 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 2 Aug 2022 14:28:19 +0800 Subject: [PATCH] optee-os.inc: support multilib Run command: bitbake optee-os && bitbake lib32-optee-os bitbake lib32-optee-os will fail with following error since bitbake optee-os already deploy same file under the path. RROR: lib32-optee-os-3.12.0+gitAUTOINC+3d47a131bc-r0 do_deploy: The recipe lib32-optee-os is trying to install files into a shared area when those files already exist. Those files and their manifest location are: /build/tmp-glibc/deploy/images/qemuarm64/optee/tee.elf (matched in manifest-qemuarm64-optee-os.deploy) Fix by deploy them to differernt dir Signed-off-by: Changqing Li Signed-off-by: Jon Mason --- meta-arm/recipes-security/optee/optee-os.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc index eee715f5..fed5d52a 100644 --- a/meta-arm/recipes-security/optee/optee-os.inc +++ b/meta-arm/recipes-security/optee/optee-os.inc @@ -51,8 +51,8 @@ do_install() { PACKAGE_ARCH = "${MACHINE_ARCH}" do_deploy() { - install -d ${DEPLOYDIR}/optee - install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/optee/ + install -d ${DEPLOYDIR}/${MLPREFIX}optee + install -m 644 ${D}${nonarch_base_libdir}/firmware/* ${DEPLOYDIR}/${MLPREFIX}optee } addtask deploy before do_build after do_install