[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5374/8267] sysroot-relativelinks: also consider links to dirs on the host



commit 87ec35603d97019683a015a157f6f1f38db8ac3a
Author: Christopher Larson <chris_larson mentor com>
Date:   Tue Mar 28 21:14:55 2017 +0500

    sysroot-relativelinks: also consider links to dirs on the host
    
    Dead symlinks, or symlinks to existing files will show up in 'files' of an
    os.walk, but symlinks to existing directories show up in 'dirs', so we need to
    consider both.
    
    As one example where this is an issue, the symlink from /usr/lib/ssl/certs was
    left pointing to /etc/ssl/certs rather than the relative path when the sdk was
    built on hosts where the latter exists.
    
    (From OE-Core rev: c5b522378fff13962a5187d9d09979866f805cb5)
    
    Signed-off-by: Christopher Larson <chris_larson mentor com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/sysroot-relativelinks.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/sysroot-relativelinks.py b/scripts/sysroot-relativelinks.py
index e44eba2..ffe2547 100755
--- a/scripts/sysroot-relativelinks.py
+++ b/scripts/sysroot-relativelinks.py
@@ -24,7 +24,7 @@ def handlelink(filep, subdir):
     os.symlink(os.path.relpath(topdir+link, subdir), filep)
 
 for subdir, dirs, files in os.walk(topdir):
-    for f in files:
+    for f in dirs + files:
         filep = os.path.join(subdir, f)
         if os.path.islink(filep):
             #print("Considering %s" % filep)


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