[gnome-continuous-yocto/gnomeostree-3.28-rocko: 482/8267] image.bbclass: additional output in create_symlinks



commit 1974624eb98d090556b23ece45271e1225c68031
Author: Patrick Ohly <patrick ohly intel com>
Date:   Wed May 18 19:24:16 2016 +0300

    image.bbclass: additional output in create_symlinks
    
    When a symlink does not get created, it is useful for debugging to log
    what would have been created and why it was skipped.
    
    (From OE-Core rev: d2b4da7d21ce5295442bd2d5c760e64cf843aabb)
    
    Signed-off-by: Patrick Ohly <patrick ohly intel com>
    Signed-off-by: Ed Bartosh <eduard bartosh intel com>
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image.bbclass |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 0e81b4e..9f4c83f 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -523,9 +523,9 @@ python create_symlinks() {
     if not link_name:
         return
     for type in subimages:
-        if os.path.exists(img_name + imgsuffix + type):
-            dst = deploy_dir + "/" + link_name + "." + type
-            src = img_name + imgsuffix + type
+        dst = deploy_dir + "/" + link_name + "." + type
+        src = img_name + imgsuffix + type
+        if os.path.exists(src):
             bb.note("Creating symlink: %s -> %s" % (dst, src))
             if os.path.islink(dst):
                 if d.getVar('RM_OLD_IMAGE', True) == "1" and \
@@ -533,6 +533,8 @@ python create_symlinks() {
                     os.remove(os.path.realpath(dst))
                 os.remove(dst)
             os.symlink(src, dst)
+        else:
+            bb.note("Skipping symlink, source does not exist: %s -> %s" % (dst, src))
 }
 
 MULTILIBRE_ALLOW_REP =. 
"${base_bindir}|${base_sbindir}|${bindir}|${sbindir}|${libexecdir}|${sysconfdir}|${nonarch_base_libdir}/udev|/lib/modules/[^/]*/modules.*|"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]