From 48e8b613b3f5c7b1d917bf3147606d44072ce49e Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Wed, 10 Apr 2013 14:25:39 +0300 Subject: 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 Signed-off-by: Richard Purdie --- scripts/postinst-intercepts/update_font_cache | 3 ++- scripts/postinst-intercepts/update_pixbuf_cache | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache index ad1bab32be..afc93d80a5 100644 --- a/scripts/postinst-intercepts/update_font_cache +++ b/scripts/postinst-intercepts/update_font_cache @@ -1,5 +1,6 @@ #!/bin/sh -PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${bindir}/fc-cache --sysroot=$D >/dev/null 2>&1 +PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ + $D${bindir}/fc-cache --sysroot=$D >/dev/null 2>&1 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 @@ export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders -PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${bindir}/gdk-pixbuf-query-loaders \ +PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ + $D${bindir}/gdk-pixbuf-query-loaders \ >$GDK_PIXBUF_MODULEDIR/../loaders.cache 2>/dev/null && \ sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache -- cgit 1.2.3-korg