diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-22 14:20:26 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-02-22 14:20:26 +0000 |
commit | df76efbdee7b4e89759ba7da2a6297152cb0b7e0 (patch) | |
tree | 78507099125d35a43fba321abeb6c33f70c20b2b /meta | |
parent | 814c3efb5c69fe340f0222de30e7077d6c07d3d1 (diff) | |
download | poky-df76efbdee7b4e89759ba7da2a6297152cb0b7e0.tar.gz |
relocatable.bbclass: Handle symlinks correctly
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/relocatable.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/relocatable.bbclass b/meta/classes/relocatable.bbclass index 37e6610131..9237b459ba 100644 --- a/meta/classes/relocatable.bbclass +++ b/meta/classes/relocatable.bbclass | |||
@@ -14,10 +14,15 @@ def rpath_replace (path, d): | |||
14 | 14 | ||
15 | for d in bindirs: | 15 | for d in bindirs: |
16 | dir = path + "/" + d | 16 | dir = path + "/" + d |
17 | bb.note("Checking %s for binaries to process" % dir) | 17 | bb.debug("Checking %s for binaries to process" % dir) |
18 | if os.path.exists(dir): | 18 | if os.path.exists(dir): |
19 | for file in os.listdir(dir): | 19 | for file in os.listdir(dir): |
20 | fpath = dir + "/" + file | 20 | fpath = dir + "/" + file |
21 | if os.path.islink(fpath): | ||
22 | fpath = os.readlink(fpath) | ||
23 | if not os.path.isabs(fpath): | ||
24 | fpath = os.path.normpath(os.path.join(dir, fpath)) | ||
25 | |||
21 | #bb.note("Testing %s for relocatability" % fpath) | 26 | #bb.note("Testing %s for relocatability" % fpath) |
22 | p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) | 27 | p = sub.Popen([cmd, '-l', fpath],stdout=sub.PIPE,stderr=sub.PIPE) |
23 | err, out = p.communicate() | 28 | err, out = p.communicate() |