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:53:58 +0100 |
| commit | 48e8b613b3f5c7b1d917bf3147606d44072ce49e (patch) | |
| tree | f789e5a6a2a64b5b3231e5239b366929dcb9e303 /meta | |
| parent | b016bc9aaabc90fe4dc98af8c5e73dfcb4526ef4 (diff) | |
| download | openembedded-core-48e8b613b3f5c7b1d917bf3147606d44072ce49e.tar.gz openembedded-core-48e8b613b3f5c7b1d917bf3147606d44072ce49e.tar.bz2 openembedded-core-48e8b613b3f5c7b1d917bf3147606d44072ce49e.zip | |
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')
| -rw-r--r-- | meta/classes/fontcache.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 7 | ||||
| -rw-r--r-- | meta/classes/pixbufcache.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/qemu.bbclass | 7 |
4 files changed, 15 insertions, 5 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass index d3c1562f24..0bc309a129 100644 --- a/meta/classes/fontcache.bbclass +++ b/meta/classes/fontcache.bbclass @@ -15,7 +15,8 @@ FONT_PACKAGES ??= "${PN}" # fontcache_common() { if [ "x$D" != "x" ] ; then - $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} + $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} \ + libdir=${libdir} base_libdir=${base_libdir} exit 1 fi diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index 6d205a1473..b53c0bc1ca 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass @@ -9,7 +9,8 @@ DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk # gtk_icon_cache_postinst() { if [ "x$D" != "x" ]; then - $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} + $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} libdir=${libdir} \ + base_libdir=${base_libdir} exit 1 fi @@ -25,7 +26,9 @@ done gtk_icon_cache_postrm() { if [ "x$D" != "x" ]; then - $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} + $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} libdir=${libdir} \ + base_libdir=${base_libdir} + exit 1 fi diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index fc749dee50..3c34557227 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -15,7 +15,8 @@ PIXBUF_PACKAGES ??= "${PN}" # pixbufcache_common() { if [ "x$D" != "x" ]; then - $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} bindir=${bindir} + $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \ + bindir=${bindir} base_libdir=${base_libdir} exit 1 fi 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): 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 |