summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-10-27 17:52:47 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-29 07:31:16 (GMT)
commitda386d3d21cb4f87336f200906b717387d3a8c21 (patch)
tree418410c96dcd1b5483f36d0f888adb59217f4160
parent63a0311497a0f9d3a748da254b631d3c7edc1364 (diff)
downloadpoky-da386d3d21cb4f87336f200906b717387d3a8c21.tar.gz
gtk-icon-cache: pass the native libdir to the intercept
The intercept runs against the native sysroot so we need to pass it the native libdir instead of the target libdir, as otherwise it will use target paths (such as lib64) in the native sysroot. (From OE-Core rev: 0fe84007176c98644b1917966c98501beb7e0ce2) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/gtk-icon-cache.bbclass2
-rw-r--r--scripts/postinst-intercepts/update_icon_cache2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 425397a..0f1052b 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -6,7 +6,7 @@ gtk_icon_cache_postinst() {
6if [ "x$D" != "x" ]; then 6if [ "x$D" != "x" ]; then
7 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ 7 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
8 mlprefix=${MLPREFIX} \ 8 mlprefix=${MLPREFIX} \
9 libdir=${libdir} 9 libdir_native=${libdir_native}
10else 10else
11 11
12 # Update the pixbuf loaders in case they haven't been registered yet 12 # Update the pixbuf loaders in case they haven't been registered yet
diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_icon_cache
index df9bdec..9cf2a72 100644
--- a/scripts/postinst-intercepts/update_icon_cache
+++ b/scripts/postinst-intercepts/update_icon_cache
@@ -3,7 +3,7 @@
3set -e 3set -e
4 4
5# update native pixbuf loaders 5# update native pixbuf loaders
6$STAGING_DIR_NATIVE/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache 6$STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
7 7
8for icondir in $D/usr/share/icons/*/ ; do 8for icondir in $D/usr/share/icons/*/ ; do
9 if [ -d $icondir ] ; then 9 if [ -d $icondir ] ; then