summaryrefslogtreecommitdiffstats
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:56:52 +0100
commit2435d807d1dd83f821367d4ec7d5e31028cb624e (patch)
tree31cf6c4ba9e6c6e8a94361ba714433c0184b8ef1
parent8cab6d76f856ad3eb140c096c4e6a3e2b5651bfb (diff)
downloadpoky-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>
-rw-r--r--meta/classes/fontcache.bbclass3
-rw-r--r--meta/classes/gtk-icon-cache.bbclass7
-rw-r--r--meta/classes/pixbufcache.bbclass3
-rw-r--r--meta/classes/qemu.bbclass7
-rw-r--r--scripts/postinst-intercepts/update_font_cache3
-rw-r--r--scripts/postinst-intercepts/update_pixbuf_cache3
6 files changed, 19 insertions, 7 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index d3c1562f24..0bc309a129 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -15,7 +15,8 @@ FONT_PACKAGES ??= "${PN}"
15# 15#
16fontcache_common() { 16fontcache_common() {
17if [ "x$D" != "x" ] ; then 17if [ "x$D" != "x" ] ; then
18 $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} 18 $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} \
19 libdir=${libdir} base_libdir=${base_libdir}
19 exit 1 20 exit 1
20fi 21fi
21 22
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 6d205a1473..b53c0bc1ca 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -9,7 +9,8 @@ DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk
9# 9#
10gtk_icon_cache_postinst() { 10gtk_icon_cache_postinst() {
11if [ "x$D" != "x" ]; then 11if [ "x$D" != "x" ]; then
12 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} 12 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} libdir=${libdir} \
13 base_libdir=${base_libdir}
13 exit 1 14 exit 1
14fi 15fi
15 16
@@ -25,7 +26,9 @@ done
25 26
26gtk_icon_cache_postrm() { 27gtk_icon_cache_postrm() {
27if [ "x$D" != "x" ]; then 28if [ "x$D" != "x" ]; then
28 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} 29 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} libdir=${libdir} \
30 base_libdir=${base_libdir}
31
29 exit 1 32 exit 1
30fi 33fi
31 34
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index fc749dee50..3c34557227 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -15,7 +15,8 @@ PIXBUF_PACKAGES ??= "${PN}"
15# 15#
16pixbufcache_common() { 16pixbufcache_common() {
17if [ "x$D" != "x" ]; then 17if [ "x$D" != "x" ]; then
18 $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} bindir=${bindir} 18 $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \
19 bindir=${bindir} base_libdir=${base_libdir}
19 exit 1 20 exit 1
20fi 21fi
21 22
diff --git a/meta/classes/qemu.bbclass b/meta/classes/qemu.bbclass
index 0e71d6aaad..930c6b082e 100644
--- a/meta/classes/qemu.bbclass
+++ b/meta/classes/qemu.bbclass
@@ -29,4 +29,9 @@ def qemu_run_binary(data, rootfs_path, binary):
29 if qemu_binary == "qemu-allarch": 29 if qemu_binary == "qemu-allarch":
30 qemu_binary = "qemuwrapper" 30 qemu_binary = "qemuwrapper"
31 31
32 return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path + " " + rootfs_path + binary 32 libdir = rootfs_path + data.getVar("libdir", False)
33 base_libdir = rootfs_path + data.getVar("base_libdir", False)
34
35 return "PSEUDO_UNLOAD=1 " + qemu_binary + " -L " + rootfs_path\
36 + " -E LD_LIBRARY_PATH=" + libdir + ":" + base_libdir + " "\
37 + rootfs_path + binary
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 @@
1#!/bin/sh 1#!/bin/sh
2 2
3PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${bindir}/fc-cache --sysroot=$D >/dev/null 2>&1 3PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
4 $D${bindir}/fc-cache --sysroot=$D >/dev/null 2>&1
4 5
5 6
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
3export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders 3export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders
4 4
5PSEUDO_UNLOAD=1 qemuwrapper -L $D $D${bindir}/gdk-pixbuf-query-loaders \ 5PSEUDO_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