diff options
| -rw-r--r-- | meta/classes/fontcache.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 7 | ||||
| -rw-r--r-- | meta/classes/pixbufcache.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/qemu.bbclass | 7 | ||||
| -rw-r--r-- | scripts/postinst-intercepts/update_font_cache | 3 | ||||
| -rw-r--r-- | scripts/postinst-intercepts/update_pixbuf_cache | 3 |
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}" # fontcache_common() { 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 fi 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 # gtk_icon_cache_postinst() { 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 fi @@ -25,7 +26,9 @@ done gtk_icon_cache_postrm() { 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 fi 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}" # pixbufcache_common() { 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 fi 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): if qemu_binary == "qemu-allarch": 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 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 |