diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-04-10 14:25:39 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-10 12:56:52 +0100 |
| commit | 2435d807d1dd83f821367d4ec7d5e31028cb624e (patch) | |
| tree | 31cf6c4ba9e6c6e8a94361ba714433c0184b8ef1 /meta/classes/gtk-icon-cache.bbclass | |
| parent | 8cab6d76f856ad3eb140c096c4e6a3e2b5651bfb (diff) | |
| download | poky-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>
Diffstat (limited to 'meta/classes/gtk-icon-cache.bbclass')
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
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 | # |
| 10 | gtk_icon_cache_postinst() { | 10 | gtk_icon_cache_postinst() { |
| 11 | if [ "x$D" != "x" ]; then | 11 | if [ "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 |
| 14 | fi | 15 | fi |
| 15 | 16 | ||
| @@ -25,7 +26,9 @@ done | |||
| 25 | 26 | ||
| 26 | gtk_icon_cache_postrm() { | 27 | gtk_icon_cache_postrm() { |
| 27 | if [ "x$D" != "x" ]; then | 28 | if [ "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 |
| 30 | fi | 33 | fi |
| 31 | 34 | ||
