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 /scripts/postinst-intercepts/update_pixbuf_cache | |
| 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 'scripts/postinst-intercepts/update_pixbuf_cache')
| -rw-r--r-- | scripts/postinst-intercepts/update_pixbuf_cache | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache index 9134529273..bd94fe88dd 100644 --- a/scripts/postinst-intercepts/update_pixbuf_cache +++ b/scripts/postinst-intercepts/update_pixbuf_cache | |||
| @@ -2,7 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders | 3 | export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders |
| 4 | 4 | ||
| 5 | PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${bindir}/gdk-pixbuf-query-loaders \ | 5 | PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ |
| 6 | $D${bindir}/gdk-pixbuf-query-loaders \ | ||
| 6 | >$GDK_PIXBUF_MODULEDIR/../loaders.cache 2>/dev/null && \ | 7 | >$GDK_PIXBUF_MODULEDIR/../loaders.cache 2>/dev/null && \ |
| 7 | sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache | 8 | sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache |
| 8 | 9 | ||