diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2018-09-06 06:17:59 +0000 |
---|---|---|
committer | Jia Zhang <zhang.jia@linux.alibaba.com> | 2018-09-06 16:57:21 +0800 |
commit | e778286de8294d1c621d6e7619faac77d88e0f10 (patch) | |
tree | d868eb0df0c5cb4f29016d09a8abe05737b39ba3 | |
parent | 13ae9807965013dac84d188e0e70b431fbf0cd23 (diff) | |
download | meta-secure-core-e778286de8294d1c621d6e7619faac77d88e0f10.tar.gz |
seloader: add the deployed artifacts to SSTATE_DUPWHITELIST
The oe-core commit 05f6042a40bb772f7ce8d6819c5b2937d8c9808d removed
DEPLOY_DIR_IMAGE from SSTATE_DUPWHITELIST which caused a do_depoy error
when enable multilib:
$ bitbake seloader lib32-seloader
ERROR: lib32-seloader-0.4.6+gitAUTOINC+8b90f76a8d-r0 do_deploy: The
recipe lib32-seloader is trying to install files into a shared area when
those files already exist. Those files and their manifest location are:
/buildarea/build/tmp-glibc/deploy/images/qemux86-64/Pkcs7VerifyDxe.efi
(matched in manifest-qemux86_64-seloader.deploy)
/buildarea/build/tmp-glibc/deploy/images/qemux86-64/Hash2DxeCrypto.efi
(matched in manifest-qemux86_64-seloader.deploy)
/buildarea/build/tmp-glibc/deploy/images/qemux86-64/efi-unsigned/Pkcs7VerifyDxe.efi
(matched in manifest-qemux86_64-seloader.deploy)
/buildarea/build/tmp-glibc/deploy/images/qemux86-64/efi-unsigned/Hash2DxeCrypto.efi
(matched in manifest-qemux86_64-seloader.deploy)
Please verify which recipe should provide the above files.
Add the deployed artifacts to SSTATE_DUPWHITELIST to fix this issue.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-rw-r--r-- | meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb b/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb index 0ea45a0..5d5fe2d 100644 --- a/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb +++ b/meta-efi-secure-boot/recipes-bsp/seloader/seloader_git.bb | |||
@@ -101,3 +101,7 @@ do_deploy() { | |||
101 | addtask deploy after do_install before do_build | 101 | addtask deploy after do_install before do_build |
102 | 102 | ||
103 | FILES_${PN} += "${EFI_TARGET}" | 103 | FILES_${PN} += "${EFI_TARGET}" |
104 | |||
105 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/efi-unsigned" | ||
106 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/Hash2DxeCrypto.efi" | ||
107 | SSTATE_DUPWHITELIST += "${DEPLOY_DIR_IMAGE}/Pkcs7VerifyDxe.efi" | ||