optee-ftpm: Install artifacts into nonarch_base_libdir

Message ID 20220425174204.377056-1-raj.khem@gmail.com
State New
Headers show
Series optee-ftpm: Install artifacts into nonarch_base_libdir | expand

Commit Message

Khem Raj April 25, 2022, 5:42 p.m. UTC
This ensures that builds do not break with usrmerge distro feature

Fixes
ERROR: QA Issue: optee-ftpm: Files/directories were installed but not shipped in any package:
  /lib
  /lib/optee_armtz
  /lib/optee_armtz/bc50d971-d4c9-42c4-82cb-343fb7f37896.ta
  /lib/optee_armtz/bc50d971-d4c9-42c4-82cb-343fb7f37896.stripped.elf

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Jon Mason April 27, 2022, 11:48 p.m. UTC | #1
On Mon, 25 Apr 2022 10:42:04 -0700, Khem Raj wrote:
> This ensures that builds do not break with usrmerge distro feature
> 
> Fixes
> ERROR: QA Issue: optee-ftpm: Files/directories were installed but not shipped in any package:
>   /lib
>   /lib/optee_armtz
>   /lib/optee_armtz/bc50d971-d4c9-42c4-82cb-343fb7f37896.ta
>   /lib/optee_armtz/bc50d971-d4c9-42c4-82cb-343fb7f37896.stripped.elf

Applied, thanks!

[1/1] optee-ftpm: Install artifacts into nonarch_base_libdir
      commit: 6a105f47b920ae02a4dd5d0949a192382ac1d5cc

Best regards,

Patch

diff --git a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
index d282c25..7ad408b 100644
--- a/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
+++ b/meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb
@@ -56,9 +56,9 @@  do_compile() {
 }
 
 do_install () {
-    mkdir -p ${D}/lib/optee_armtz
-    install -D -p -m 0644 ${S}/Samples/ARM32-FirmwareTPM/optee_ta/out/fTPM/${FTPM_UUID}.ta ${D}/lib/optee_armtz/
-    install -D -p -m 0644 ${S}/Samples/ARM32-FirmwareTPM/optee_ta/out/fTPM/${FTPM_UUID}.stripped.elf ${D}/lib/optee_armtz/
+    mkdir -p ${D}/${nonarch_base_libdir}/optee_armtz
+    install -D -p -m 0644 ${S}/Samples/ARM32-FirmwareTPM/optee_ta/out/fTPM/${FTPM_UUID}.ta ${D}/${nonarch_base_libdir}/optee_armtz/
+    install -D -p -m 0644 ${S}/Samples/ARM32-FirmwareTPM/optee_ta/out/fTPM/${FTPM_UUID}.stripped.elf ${D}/${nonarch_base_libdir}/optee_armtz/
 }
 
 do_deploy () {