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>
This commit is contained in:
parent
8cab6d76f8
commit
2435d807d1
|
@ -15,7 +15,8 @@ FONT_PACKAGES ??= "${PN}"
|
||||||
#
|
#
|
||||||
fontcache_common() {
|
fontcache_common() {
|
||||||
if [ "x$D" != "x" ] ; then
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,8 @@ DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk
|
||||||
#
|
#
|
||||||
gtk_icon_cache_postinst() {
|
gtk_icon_cache_postinst() {
|
||||||
if [ "x$D" != "x" ]; then
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -25,7 +26,9 @@ done
|
||||||
|
|
||||||
gtk_icon_cache_postrm() {
|
gtk_icon_cache_postrm() {
|
||||||
if [ "x$D" != "x" ]; then
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,8 @@ PIXBUF_PACKAGES ??= "${PN}"
|
||||||
#
|
#
|
||||||
pixbufcache_common() {
|
pixbufcache_common() {
|
||||||
if [ "x$D" != "x" ]; then
|
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
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -29,4 +29,9 @@ def qemu_run_binary(data, rootfs_path, binary):
|
||||||
if qemu_binary == "qemu-allarch":
|
if qemu_binary == "qemu-allarch":
|
||||||
qemu_binary = "qemuwrapper"
|
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
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#!/bin/sh
|
#!/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
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
|
|
||||||
export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders
|
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 && \
|
>$GDK_PIXBUF_MODULEDIR/../loaders.cache 2>/dev/null && \
|
||||||
sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache
|
sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue