diff options
author | Matt Cowell <matt.cowell@nsn.com> | 2014-04-17 14:23:13 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-11 12:27:21 +0100 |
commit | 1b82c73df43500d64dc49a9fb4a2546d88a5f95e (patch) | |
tree | 6918edfa1ba94a18f6a7d66b2753e600be70864c /meta | |
parent | a1bad2435227ce16fe63ed14087f72c24767e6e1 (diff) | |
download | ast2050-yocto-poky-1b82c73df43500d64dc49a9fb4a2546d88a5f95e.zip ast2050-yocto-poky-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')
-rw-r--r-- | meta/classes/chrpath.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index 7bdb1b9..7765020 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): def process_dir (rootdir, directory, d): import stat + rootdir = os.path.normpath(rootdir) cmd = d.expand('${CHRPATH_BIN}') tmpdir = os.path.normpath(d.getVar('TMPDIR')) baseprefix = os.path.normpath(d.expand('${base_prefix}')) |