From 753cfcadd8cc683e69b6707b823dc49dfb34ab0b Mon Sep 17 00:00:00 2001 From: Matt Cowell Date: Thu, 17 Apr 2014 14:23:13 -0500 Subject: 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. Signed-off-by: Richard Purdie --- meta/classes/chrpath.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'meta') 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): 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}')) -- cgit 1.2.3-korg