summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-06-24 17:27:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-27 12:20:36 +0100
commite58f930df5a22ee42c27cff0ca12bc9bf961b74b (patch)
tree30078a870ad6cc214147aeead54641e6222e563e
parentb111ac57aebd9928765b9bb8ee2fb4eb3c74972a (diff)
downloadpoky-e58f930df5a22ee42c27cff0ca12bc9bf961b74b.tar.gz
gtk-icon-cache: rename intercept to update_gtk_icon_cache
The intercept is called update_icon_cache which is vague: rename to update_gtk_icon_cache to make it clearer what it is for, and add a comment explaining what class caused it to be used. (From OE-Core rev: 3158adbe684890adc56af11e19af872e90e09d41) 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.bbclass4
-rw-r--r--scripts/postinst-intercepts/update_gtk_icon_cache (renamed from scripts/postinst-intercepts/update_icon_cache)3
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index 66fe781bd2..91cb4ad409 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -6,7 +6,7 @@ PACKAGE_WRITE_DEPS += "gtk+3-native gdk-pixbuf-native"
6 6
7gtk_icon_cache_postinst() { 7gtk_icon_cache_postinst() {
8if [ "x$D" != "x" ]; then 8if [ "x$D" != "x" ]; then
9 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ 9 $INTERCEPT_DIR/postinst_intercept update_gtk_icon_cache ${PKG} \
10 mlprefix=${MLPREFIX} \ 10 mlprefix=${MLPREFIX} \
11 libdir_native=${libdir_native} 11 libdir_native=${libdir_native}
12else 12else
@@ -24,7 +24,7 @@ fi
24 24
25gtk_icon_cache_postrm() { 25gtk_icon_cache_postrm() {
26if [ "x$D" != "x" ]; then 26if [ "x$D" != "x" ]; then
27 $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG} \ 27 $INTERCEPT_DIR/postinst_intercept update_gtk_icon_cache ${PKG} \
28 mlprefix=${MLPREFIX} \ 28 mlprefix=${MLPREFIX} \
29 libdir=${libdir} 29 libdir=${libdir}
30else 30else
diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_gtk_icon_cache
index 212209a9da..99367a2855 100644
--- a/scripts/postinst-intercepts/update_icon_cache
+++ b/scripts/postinst-intercepts/update_gtk_icon_cache
@@ -2,10 +2,11 @@
2# 2#
3# SPDX-License-Identifier: MIT 3# SPDX-License-Identifier: MIT
4# 4#
5# Post-install intercept for gtk-icon-cache.bbclass
5 6
6set -e 7set -e
7 8
8# update native pixbuf loaders 9# Update native pixbuf loaders
9$STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache 10$STAGING_DIR_NATIVE/${libdir_native}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
10 11
11for icondir in $D/usr/share/icons/*/ ; do 12for icondir in $D/usr/share/icons/*/ ; do