summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-04 16:27:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-06 23:52:58 +0000
commit7fd1d7e639c2ed7e0699937a5cb245c187b7c811 (patch)
tree007589371df4f00fa0209faafb7a21fde6754370 /meta/lib/oe
parent7ea670c3b00439ca5eeb6ae1efd475f0954268b7 (diff)
downloadopenembedded-core-7fd1d7e639c2ed7e0699937a5cb245c187b7c811.tar.gz
openembedded-core-7fd1d7e639c2ed7e0699937a5cb245c187b7c811.tar.bz2
openembedded-core-7fd1d7e639c2ed7e0699937a5cb245c187b7c811.zip
insane/prelink: Handle nonstandard library paths
Prelink contains some hardcoded assumptions about the path layout of the target system. Unfortunately if the system doesn't match, prelink doesn't work. This breaks: a) prelink of those images b) the unsafe-references-in-binaries QA test (which uses prelink-rtld) One way to work around this is to construct an ld.so.conf file which lists the library paths in question. We do this in sanity QA check and in the rootfs prelink code, being careful not to trample any existing target ld.so.conf. There is an additional problem that $LIB references in RPATHs won't be handled correctly, I've not see any system use these in reality though so this change at least improves things. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/utils.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 9a86410b15..30d30629f1 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -293,3 +293,14 @@ class ThreadedPool:
self.tasks.join()
for worker in self.workers:
worker.join()
+
+def write_ld_so_conf(d):
+ # Some utils like prelink may not have the correct target library paths
+ # so write an ld.so.conf to help them
+ ldsoconf = d.expand("${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf")
+ if os.path.exists(ldsoconf):
+ bb.utils.remove(ldsoconf)
+ bb.utils.mkdirhier(os.path.dirname(ldsoconf))
+ with open(ldsoconf, "w") as f:
+ f.write(d.getVar("base_libdir", True) + '\n')
+ f.write(d.getVar("libdir", True) + '\n')