Skip to contentSkip to conversation

optee-ftpm: Install artifacts into nonarch_base_libdir

PATCH Applied Khem Raj 2 participants 2 messages Apr 25, 2022 – Apr 27, 2022

lore
Share & tools
lore

Khem Raj

author
#0 lore raw

PATCH 1/1 optee-ftpm: Install artifacts into nonarch_base_libdir

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

---
 meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
meta-arm/recipes-security/optee-ftpm/optee-ftpm_git.bb +3 -3
index d282c25..7ad408b 100644
@@ -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 () {
Signature · 1 line
2.36.0
Applied
#1 lore raw
Quoted 8 lines · Khem Raj

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,

Signature · 1 line
Jon Mason <[email protected]>