aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/qemu.bbclass
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-04-10 14:25:39 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-10 12:53:58 +0100
commit48e8b613b3f5c7b1d917bf3147606d44072ce49e (patch)
treef789e5a6a2a64b5b3231e5239b366929dcb9e303 /meta/classes/qemu.bbclass
parentb016bc9aaabc90fe4dc98af8c5e73dfcb4526ef4 (diff)
downloadopenembedded-core-contrib-48e8b613b3f5c7b1d917bf3147606d44072ce49e.tar.gz
postinst-intercepts, qemu.bbclass: fix segfaults in postinstalls
Postinstalls that use qemu are throwing a segmentation fault when building for qemux86-64 on a 64bit host (it might also happen for qemux86 if building on a 32bit host but I didn't test). It looks like qemu looks for ld.so.cache which is not found because it is generated after rootfs_(rpm|ipk|deb)_do_rootfs is called and then it tries to load libraries from the default paths (which are the host's). In order to avoid this, pass the LD_LIBRARY_PATH explicitly to the target's dynamic loader. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/qemu.bbclass')
-rw-r--r--meta/classes/qemu.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 0e71d6aaad7..930c6b082e0 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -29,4 +29,9 @@ def qemu_run_binary(data, rootfs_path, binary):
if qemu_binary == "qemu-allarch":
qemu_binary = "qemuwrapper"
- return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path + " " + rootfs_path + binary
+ libdir = rootfs_path + data.getVar("libdir", False)
+ base_libdir = rootfs_path + data.getVar("base_libdir", False)
+
+ return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\
+ + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\
+ + rootfs_path + binary