summaryrefslogtreecommitdiff
path: root/scripts/postinst-intercepts
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 /scripts/postinst-intercepts
parentb016bc9aaabc90fe4dc98af8c5e73dfcb4526ef4 (diff)
downloadopenembedded-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 'scripts/postinst-intercepts')
-rw-r--r--scripts/postinst-intercepts/update_font_cache3
-rw-r--r--scripts/postinst-intercepts/update_pixbuf_cache3
2 files changed, 4 insertions, 2 deletions
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