sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

chrpath: normalize the paths 

By normalizing the paths the path comparing code works correct
to generate the right RPATH even when there is a A/../A in TMPDIR

[YOCTO #3408]

(From OE-Core rev: 50327f2bba9f479dd209cdc54646b9d551e84c59)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2012-12-11 17:40:57 -08:00 committed by Richard Purdie
parent dc8bdc872e
commit 8669fec353
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/classes/chrpath.bbclass
View File

@ -6,8 +6,8 @@ def process_dir (directory, d):
import stat
cmd = d.expand('${CHRPATH_BIN}')
tmpdir = d.getVar('TMPDIR')
basedir = d.expand('${base_prefix}')
tmpdir = os.path.normpath(d.getVar('TMPDIR'))
basedir = os.path.normpath(d.expand('${base_prefix}'))
#bb.debug("Checking %s for binaries to process" % directory)
if not os.path.exists(directory):
@ -49,6 +49,7 @@ def process_dir (directory, d):
new_rpaths = []
for rpath in rpaths:
# If rpath is already dynamic copy it to new_rpath and continue
rpath = os.path.normpath(rpath)
if rpath.find("$ORIGIN") != -1:
new_rpaths.append(rpath.strip())
continue