[PATCH] sysroot-relativelinks: also consider links to dirs on the host

[PATCH] sysroot-relativelinks: also consider links to dirs on the host

[Christopher Larson]

From: Christopher Larson <chris_larson@mentor.com>

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 specific example, 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.

JIRA: SB-8374

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 scripts/sysroot-relativelinks.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)
-- 
2.8.0

Re: [PATCH] sysroot-relativelinks: also consider links to dirs on the host

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

On Thu, Dec 29, 2016 at 11:06 AM, Christopher Larson <kergoth@gmail.com>
wrote:

> From: Christopher Larson <chris_larson@mentor.com>
>
> 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 specific example, 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.
>
> JIRA: SB-8374
>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>

Erm, sorry about the JIRA:, remnant from our fork.
-- 
Christopher Larson
kergoth at gmail dot com
Founder - BitBake, OpenEmbedded, OpenZaurus
Senior Software Engineer, Mentor Graphics

[-- Attachment #2: Type: text/html, Size: 1380 bytes --]