summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-10-20 20:19:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-10-27 07:24:30 +0000
commita2d5b7ac76c13b07a6840415a8c1202e3afa79a8 (patch)
tree707b38b517fa715118a23a2261b6c4543961b009 /meta
parent517132904ede7b1dac2d911ec2ad587a1d180f6a (diff)
downloadpoky-a2d5b7ac76c13b07a6840415a8c1202e3afa79a8.tar.gz
classes/gtk-icon-cache: don't pass STAGING_LIBDIR_NATIVE to intercepts
The intercept doesn't need STAGING_LIBDIR_NATIVE anymore, so don't pass it. (From OE-Core rev: 189d6232a2a9eb7192887b60f05b6643414a4ec6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/gtk-icon-cache.bbclass6
1 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 6195fa4526..425397af3a 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -6,8 +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=${libdir}
10 STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE}
11else 10else
12 11
13 # 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
@@ -25,8 +24,7 @@ gtk_icon_cache_postrm() {
25if [ "x$D" != "x" ]; then 24if [ "x$D" != "x" ]; then
26 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ 25 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \
27 mlprefix=${MLPREFIX} \ 26 mlprefix=${MLPREFIX} \
28 libdir=${libdir} \ 27 libdir=${libdir}
29 STAGING_LIBDIR_NATIVE=${STAGING_LIBDIR_NATIVE}
30else 28else
31 for icondir in /usr/share/icons/* ; do 29 for icondir in /usr/share/icons/* ; do
32 if [ -d $icondir ] ; then 30 if [ -d $icondir ] ; then