diff mbox series

[master,kirkstone,meta-arm] optee-os.inc: support multilib

Message ID 20220802062819.4061434-1-changqing.li@windriver.com
State New
Headers show
Series [master,kirkstone,meta-arm] optee-os.inc: support multilib | expand

Commit Message

Changqing Li Aug. 2, 2022, 6:28 a.m. UTC 
From: Changqing Li <changqing.li@windriver.com>

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 <changqing.li@windriver.com>
---
 meta-arm/recipes-security/optee/optee-os.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jon Mason Aug. 3, 2022, 1:32 p.m. UTC | #1 
On Tue, 2 Aug 2022 14:28:19 +0800, changqing.li@windriver.com wrote:
> 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)
> 
> [...]

Applied, thanks!

[1/1] optee-os.inc: support multilib
      commit: 844696e401bca5df7a06092c059d03ea71df9990

Best regards,
Jon Mason Aug. 4, 2022, 1:06 p.m. UTC | #2 
On Tue, 2 Aug 2022 14:28:19 +0800, changqing.li@windriver.com wrote:
> 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)
> 
> [...]

Applied, thanks!

[1/1] optee-os.inc: support multilib
      commit: 844696e401bca5df7a06092c059d03ea71df9990

Best regards,
Jon Mason Aug. 8, 2022, 7:32 p.m. UTC | #3 
On Tue, 2 Aug 2022 14:28:19 +0800, changqing.li@windriver.com wrote:
> 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)
> 
> [...]

Applied, thanks!

[1/1] optee-os.inc: support multilib
      commit: 844696e401bca5df7a06092c059d03ea71df9990

Best regards,
diff mbox series

Patch

diff --git a/meta-arm/recipes-security/optee/optee-os.inc b/meta-arm/recipes-security/optee/optee-os.inc
index eee715f..fed5d52 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