This recipe deploys the raw SYSFW unconditionally which causes issues
when doing multiconfig builds. What should happen is only one deploys
these, select that the same way we select which one deploys the default
SYSFW symlink. Move the deploy step there.

Signed-off-by: Andrew Davis <[email protected]>
---
 recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb 
b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
index 72a3120e..841fe16a 100644
--- a/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
+++ b/recipes-bsp/ti-sci-fw/ti-sci-fw_git.bb
@@ -99,6 +99,7 @@ do_deploy () {
                ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_IMAGE}
                if [ ! -z "${SYSFW_SYMLINK}" ]; then
                        ln -sf ${SYSFW_VBINARY} ${DEPLOYDIR}/${SYSFW_SYMLINK}
+                       install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
                fi
        fi
 
@@ -106,10 +107,9 @@ do_deploy () {
                install -m 644 ${WORKDIR}/imggen/${SYSFW_TIBOOT3} 
${DEPLOYDIR}/${SYSFW_TIBOOT3}
                if [ ! -z "${SYSFW_TIBOOT3_SYMLINK}" ]; then
                        ln -sf ${SYSFW_TIBOOT3} 
${DEPLOYDIR}/${SYSFW_TIBOOT3_SYMLINK}
+                       install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
                fi
        fi
-
-       install -m 644 ${SYSFW_TISCI} ${DEPLOYDIR}/
 }
 
 addtask deploy before do_build after do_compile
-- 
2.36.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14935): 
https://lists.yoctoproject.org/g/meta-ti/message/14935
Mute This Topic: https://lists.yoctoproject.org/mt/92838667/21656
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to