diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-04-10 14:25:39 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-10 12:56:52 +0100 |
| commit | 2435d807d1dd83f821367d4ec7d5e31028cb624e (patch) | |
| tree | 31cf6c4ba9e6c6e8a94361ba714433c0184b8ef1 /meta/classes/qemu.bbclass | |
| parent | 8cab6d76f856ad3eb140c096c4e6a3e2b5651bfb (diff) | |
| download | poky-2435d807d1dd83f821367d4ec7d5e31028cb624e.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.
(From OE-Core rev: 48e8b613b3f5c7b1d917bf3147606d44072ce49e)
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.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass index 0e71d6aaad..930c6b082e 100644 --- a/meta/classes/qemu.bbclass +++ b/meta/classes/qemu.bbclass | |||
| @@ -29,4 +29,9 @@ def qemu_run_binary(data, rootfs_path, binary): | |||
| 29 | if qemu_binary == "qemu-allarch": | 29 | if qemu_binary == "qemu-allarch": |
| 30 | qemu_binary = "qemuwrapper" | 30 | qemu_binary = "qemuwrapper" |
| 31 | 31 | ||
| 32 | return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path + " " + rootfs_path + binary | 32 | libdir = rootfs_path + data.getVar("libdir", False) |
| 33 | base_libdir = rootfs_path + data.getVar("base_libdir", False) | ||
| 34 | |||
| 35 | return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\ | ||
| 36 | + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\ | ||
| 37 | + rootfs_path + binary | ||
