[meta-arago] [rocko/master][PATCH] optee-os: move resulting bins from out/ directory, as it's removed between builds

[Denys Dmytriyenko]

Signed-off-by: Denys Dmytriyenko <de...@ti.com>
---
 .../optee/optee-os_git.bbappend               | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/meta-arago-distro/recipes-security/optee/optee-os_git.bbappend 
b/meta-arago-distro/recipes-security/optee/optee-os_git.bbappend
index 8fc9cf32..2204a50c 100644
--- a/meta-arago-distro/recipes-security/optee/optee-os_git.bbappend
+++ b/meta-arago-distro/recipes-security/optee/optee-os_git.bbappend
@@ -40,7 +40,7 @@ do_compile() {
     ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \
         ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee.bin 
tee.bin.signed; \
         normfl=`echo ${OPTEEFLAVOR} | tr "_" "-"`
-        mv tee.bin.signed $normfl.optee; \
+        mv tee.bin.signed ${B}/$normfl.optee; \
     )
 
     if [ "${OPTEEPAGER}" = "y" ]; then
@@ -50,7 +50,7 @@ do_compile() {
         ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \
             ${TI_SECURE_DEV_PKG}/scripts/secure-binary-image.sh tee.bin 
tee.bin.signed; \
             normfl=`echo ${OPTEEFLAVOR} | tr "_" "-"`
-            mv tee.bin.signed $normfl-pager.optee; \
+            mv tee.bin.signed ${B}/$normfl-pager.optee; \
         )
     fi
 }
@@ -58,17 +58,17 @@ do_compile() {
 do_compile_aarch64() {
     oe_runmake all PLATFORM=${OPTEEMACHINE} PLATFORM_FLAVOR=${OPTEEFLAVOR}
     ( cd out/arm-plat-${OPTEEOUTPUTMACHINE}/core/; \
-        cp tee-pager.bin bl32.bin; \
-        cp tee.elf bl32.elf; \
+        cp tee-pager.bin ${B}/bl32.bin; \
+        cp tee.elf ${B}/bl32.elf; \
     )
 }
 
 do_install() {
     #install core on boot directory
     install -d ${D}/boot
-    install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/*.optee 
${D}/boot || true
-    install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/bl32.bin 
${D}/boot || true
-    install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/bl32.elf 
${D}/boot || true
+    install -m 644 ${B}/*.optee ${D}/boot || true
+    install -m 644 ${B}/bl32.bin ${D}/boot || true
+    install -m 644 ${B}/bl32.elf ${D}/boot || true
 
     #install TA devkit
     install -d ${D}/usr/include/optee/export-user_ta/
@@ -79,9 +79,9 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}
-    install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/*.optee 
${DEPLOYDIR} || true
-    install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/bl32.bin 
${DEPLOYDIR} || true
-    install -m 644 ${B}/out/arm-plat-${OPTEEOUTPUTMACHINE}/core/bl32.elf 
${DEPLOYDIR} || true
+    install -m 644 ${B}/*.optee ${DEPLOYDIR} || true
+    install -m 644 ${B}/bl32.bin ${DEPLOYDIR} || true
+    install -m 644 ${B}/bl32.elf ${DEPLOYDIR} || true
 }
 
 FILES_${PN} = "/boot"
-- 
2.17.1

_______________________________________________
meta-arago mailing list
meta-arago@arago-project.org
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago