[OE-core] [PATCH 2/3] intercepts/update_icon_cache: use STAGING_DIR_NATIVE from environment

Ross Burton ross.burton at intel.com
Tue Oct 20 19:32:58 UTC 2015


Instead of expecting that the calling postinst has exported
STAGING_LIBDIR_NATIVE (which will get set to the sysroot at package build time
and may not be correct if sstate is used), use the new STAGING_DIR_NATIVE that
is exported by rootfs.py.

[ YOCTO #8547 ]

Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/postinst-intercepts/update_icon_cache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_icon_cache
index c02273d..df9bdec 100644
--- a/scripts/postinst-intercepts/update_icon_cache
+++ b/scripts/postinst-intercepts/update_icon_cache
@@ -3,7 +3,7 @@
 set -e
 
 # update native pixbuf loaders
-${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
+$STAGING_DIR_NATIVE/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
 
 for icondir in $D/usr/share/icons/*/ ; do
     if [ -d $icondir ] ; then
-- 
2.1.4




More information about the Openembedded-core mailing list