From: Ting Liu <ting.liu@nxp.com>
Date: Fri, 12 Jun 2020 11:38:41 +0000 (+0800)
Subject: management-complex: avoid soft link loop in do_deploy
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=fa1844cc2e013240b37c6964bf6dea767ef90aa2;p=meta-freescale.git

management-complex: avoid soft link loop in do_deploy

when the deploy mc_app directory is already populated, a soft link
loop from mc.itb to mc.itb will be created.

Steps to reproduce:
$ bitbake -c cleansstate management-complex
$ bitbake management-complex
$ bitbake -c deploy -f management-complex

Use 'find -type f' to exclude links.

Signed-off-by: Ting Liu <ting.liu@nxp.com>
---

diff --git a/recipes-dpaa2/management-complex/management-complex_10.14.1.bb b/recipes-dpaa2/management-complex/management-complex_10.14.1.bb
index 52da410e..ddb305c1 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.14.1.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.14.1.bb
@@ -25,7 +25,7 @@ do_deploy () {
     install -d ${DEPLOYDIR}/mc_app
     install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app
     # make a symlink to the latest binary
-    for mc_binary in `ls ${DEPLOYDIR}/mc_app |sort`;do
+    for mc_binary in `find ${DEPLOYDIR}/mc_app -type f -printf "%f\n" |sort`;do
         ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb
     done
 }
diff --git a/recipes-dpaa2/management-complex/management-complex_10.20.4.bb b/recipes-dpaa2/management-complex/management-complex_10.20.4.bb
index a687657c..3e14a26e 100644
--- a/recipes-dpaa2/management-complex/management-complex_10.20.4.bb
+++ b/recipes-dpaa2/management-complex/management-complex_10.20.4.bb
@@ -25,7 +25,7 @@ do_deploy () {
     install -d ${DEPLOYDIR}/mc_app
     install -m 755 ${S}/${REGLEX}/*.itb ${DEPLOYDIR}/mc_app
     # make a symlink to the latest binary
-    for mc_binary in `ls ${DEPLOYDIR}/mc_app |sort`;do
+    for mc_binary in `find ${DEPLOYDIR}/mc_app -type f -printf "%f\n" |sort`;do
         ln -sfT ${mc_binary} ${DEPLOYDIR}/mc_app/mc.itb
     done
 }