[oe-commits] Saul Wold : chrpath: normalize the paths
git at git.openembedded.org
git at git.openembedded.org
Thu Dec 13 18:02:48 UTC 2012
Module: openembedded-core.git
Branch: master-next
Commit: 50327f2bba9f479dd209cdc54646b9d551e84c59
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=50327f2bba9f479dd209cdc54646b9d551e84c59
Author: Saul Wold <sgw at linux.intel.com>
Date: Tue Dec 11 17:40:57 2012 -0800
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]
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/chrpath.bbclass | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 4a6e697..82329d1 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -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
More information about the Openembedded-commits
mailing list