summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-29 00:45:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:18:48 +0000
commit6b94569d5d8e8bdd575d12e260abf10d3ac11cfd (patch)
tree8071bdf183c24bfa482cc3ceac0db53feb3bb8f4
parenta66660aa5bb709547ce0b65a4563e4217c3c3d9f (diff)
downloadopenembedded-core-contrib-6b94569d5d8e8bdd575d12e260abf10d3ac11cfd.tar.gz
openembedded-core-contrib-6b94569d5d8e8bdd575d12e260abf10d3ac11cfd.tar.bz2
openembedded-core-contrib-6b94569d5d8e8bdd575d12e260abf10d3ac11cfd.zip
chrpath: Remove standard search paths from RPATHS
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/chrpath.bbclass13
1 files changed, 9 insertions, 4 deletions
diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass
index 3b5cd37f7b..f183b4aeeb 100644
--- a/meta/classes/chrpath.bbclass
+++ b/meta/classes/chrpath.bbclass
@@ -17,19 +17,24 @@ def process_file_linux(cmd, fpath, rootdir, baseprefix, tmpdir, d):
# Throw away everything other than the rpath list
curr_rpath = out.partition("RPATH=")[2]
#bb.note("Current rpath for %s is %s" % (fpath, curr_rpath.strip()))
- rpaths = curr_rpath.split(":")
+ rpaths = curr_rpath.strip().split(":")
new_rpaths = []
modified = False
for rpath in rpaths:
# If rpath is already dynamic copy it to new_rpath and continue
if rpath.find("$ORIGIN") != -1:
- new_rpaths.append(rpath.strip())
+ new_rpaths.append(rpath)
continue
rpath = os.path.normpath(rpath)
if baseprefix not in rpath and tmpdir not in rpath:
- new_rpaths.append(rpath.strip())
+ # Skip standard search paths
+ if rpath in ['/lib', '/usr/lib', '/lib64/', '/usr/lib64']:
+ bb.warn("Skipping RPATH %s as is a standard search path for %s" % (rpath, fpath))
+ modified = True
+ continue
+ new_rpaths.append(rpath)
continue
- new_rpaths.append("$ORIGIN/" + os.path.relpath(rpath.strip(), os.path.dirname(fpath.replace(rootdir, "/"))))
+ new_rpaths.append("$ORIGIN/" + os.path.relpath(rpath, os.path.dirname(fpath.replace(rootdir, "/"))))
modified = True
# if we have modified some rpaths call chrpath to update the binary