summaryrefslogtreecommitdiff
path: root/meta/classes/gtk-icon-cache.bbclass
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-02-12 18:12:39 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-12 16:35:13 +0000
commitd7ddae84165b5b84dc6ac640fd492ade891ddd4e (patch)
tree5540a03096d8f40d7af4c0efa12e90dfcf94827e /meta/classes/gtk-icon-cache.bbclass
parent414c3918baccc2166bba536c956eebaeb49aace3 (diff)
downloadopenembedded-core-d7ddae84165b5b84dc6ac640fd492ade891ddd4e.tar.gz
openembedded-core-d7ddae84165b5b84dc6ac640fd492ade891ddd4e.tar.bz2
openembedded-core-d7ddae84165b5b84dc6ac640fd492ade891ddd4e.zip
gtk-icon-cache.bbclass: use postinst_intercept script
Since the hook has been made a standalone script, use postinst_intercept script in order to "link" the package to the hook. Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/gtk-icon-cache.bbclass')
-rw-r--r--meta/classes/gtk-icon-cache.bbclass39
1 files changed, 9 insertions, 30 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass
index cf33efd5a6..2ca99acdf9 100644
--- a/meta/classes/gtk-icon-cache.bbclass
+++ b/meta/classes/gtk-icon-cache.bbclass
@@ -2,23 +2,15 @@ FILES_${PN} += "${datadir}/icons/hicolor"
DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk+-native"
+#
+# On host, the postinstall MUST return 1 because we do not know if the intercept
+# hook will succeed. If it does succeed, than the packages will be marked as
+# installed.
+#
gtk_icon_cache_postinst() {
if [ "x$D" != "x" ]; then
- if [ ! -f $INTERCEPT_DIR/update_icon_cache ]; then
- cat << "EOF" > $INTERCEPT_DIR/update_icon_cache
-#!/bin/sh
-
-# update native pixbuf loaders
-gdk-pixbuf-query-loaders --update-cache
-
-for icondir in $D/usr/share/icons/*/ ; do
- if [ -d $icondir ] ; then
- gtk-update-icon-cache -fqt $icondir
- fi
-done
-EOF
- fi
- exit 0
+ $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG}
+ exit 1
fi
# Update the pixbuf loaders in case they haven't been registered yet
@@ -33,21 +25,8 @@ done
gtk_icon_cache_postrm() {
if [ "x$D" != "x" ]; then
- if [ ! -f $INTERCEPT_DIR/update_icon_cache ]; then
- cat << "EOF" > $INTERCEPT_DIR/update_icon_cache
-#!/bin/sh
-
-# update native pixbuf loaders
-gdk-pixbuf-query-loaders --update-cache
-
-for icondir in $D/usr/share/icons/*/ ; do
- if [ -d $icondir ] ; then
- gtk-update-icon-cache -fqt $icondir
- fi
-done
-EOF
- fi
- exit 0
+ $INTERCEPT_DIR/postinst_intercept update_icon_cache ${PKG}
+ exit 1
fi
for icondir in /usr/share/icons/* ; do