summaryrefslogtreecommitdiffstats
path: root/meta/classes/chrpath.bbclass
diff options
context:
space:
mode:
authorMatt Cowell <matt.cowell@nsn.com>2014-04-17 14:23:13 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-11 12:27:21 +0100
commit1b82c73df43500d64dc49a9fb4a2546d88a5f95e (patch)
tree6918edfa1ba94a18f6a7d66b2753e600be70864c /meta/classes/chrpath.bbclass
parenta1bad2435227ce16fe63ed14087f72c24767e6e1 (diff)
downloadpoky-1b82c73df43500d64dc49a9fb4a2546d88a5f95e.tar.gz
chrpath: properly handle rootdir with '..' in path
When there is a '..' in the rootdir path, rootdir will not be a substring of fpath. This causes an incorrect rpath of the difference between the workdir and the sysroot to be computed, which is incorrect. Normalizing basedir fixes this issue. (From OE-Core rev: 753cfcadd8cc683e69b6707b823dc49dfb34ab0b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/chrpath.bbclass')
-rw-r--r--meta/classes/chrpath.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 7bdb1b9938..7765020e98 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -61,6 +61,7 @@ def process_file_darwin(cmd, fpath, rootdir, baseprefix, tmpdir, d):
61def process_dir (rootdir, directory, d): 61def process_dir (rootdir, directory, d):
62 import stat 62 import stat
63 63
64 rootdir = os.path.normpath(rootdir)
64 cmd = d.expand('${CHRPATH_BIN}') 65 cmd = d.expand('${CHRPATH_BIN}')
65 tmpdir = os.path.normpath(d.getVar('TMPDIR')) 66 tmpdir = os.path.normpath(d.getVar('TMPDIR'))
66 baseprefix = os.path.normpath(d.expand('${base_prefix}')) 67 baseprefix = os.path.normpath(d.expand('${base_prefix}'))