From: Ross Burton <ross.burton@intel.com>
Date: Tue, 20 Oct 2015 19:17:58 +0000 (+0100)
Subject: intercepts/update_icon_cache: use STAGING_DIR_NATIVE from environment
X-Git-Tag: 2015-10~16
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=9fa5ff645eb683533af482925079dff5c9151831;p=openembedded-core.git

intercepts/update_icon_cache: use STAGING_DIR_NATIVE from environment

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@intel.com>
---

diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_icon_cache
index c02273d52a..df9bdecc99 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