[OE-core] [PATCH] postinst-intercepts, qemu.bbclass: fix segfaults in postinstalls
Laurentiu Palcu
laurentiu.palcu at intel.com
Tue Apr 9 15:53:51 UTC 2013
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 at intel.com>
---
meta/classes/qemu.bbclass | 4 +++-
scripts/postinst-intercepts/update_font_cache | 3 ++-
scripts/postinst-intercepts/update_pixbuf_cache | 3 ++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 0e71d6a..6881826 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -29,4 +29,6 @@ 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
+ return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\
+ + " -E LD_LIBRARY_PATH=" + rootfs_path + "/lib:" + rootfs_path\
+ + "/usr/lib " + rootfs_path + binary
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
index ad1bab3..fa2c0ef 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/lib:$D/usr/lib\
+ $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 9134529..fbb6fd1 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/lib:$D/usr/lib\
+ $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
--
1.7.9.5
More information about the Openembedded-core
mailing list