[PATCH v4 4/6] image: Remove recursion in get_image_name

[claudius.heine.ext@siemens.com]

From: Harald Seiler <hws@denx.de>

The use of recursion in this function is not immediately
obvious.  This commit refactors the recursion into a more
visible imperative code style.

Signed-off-by: Harald Seiler <hws@denx.de>
---
 meta/classes/image.bbclass | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 34d6515..a60441c 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -43,13 +43,24 @@ ROOTFS_EXTRA ?= "64"
 def get_image_name(d, name_link):
     S = d.getVar("IMAGE_ROOTFS", True)
     path_link = os.path.join(S, name_link)
+
+    # If path_link does not exist, it might be a symlink
+    # in the target rootfs.  This block attempts to resolve
+    # it relative to the rootfs location.
+    if not os.path.exists(path_link):
+        path_link = os.path.join(
+            S,
+            os.path.relpath(
+                os.path.realpath(path_link),
+                "/",
+            ),
+        )
+
     if os.path.exists(path_link):
         base = os.path.basename(os.path.realpath(path_link))
         full = d.getVar("IMAGE_FULLNAME", True) + "." + base
         return [base, full]
-    if os.path.islink(path_link):
-        return get_image_name(d, os.path.relpath(os.path.realpath(path_link),
-                                                 '/'))
+
     return ["", ""]
 
 def get_rootfs_size(d):
-- 
2.20.1