diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-02-12 18:12:39 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-13 16:52:29 +0000 |
| commit | ceabaf626538ccdbd06ec4e8d87024216a064f52 (patch) | |
| tree | c9570cd04d2a96cbe4923833a7dccd808428e327 | |
| parent | 5bb362a0ba97687029b3aef76b7e789570a4d728 (diff) | |
| download | ast2050-yocto-poky-ceabaf626538ccdbd06ec4e8d87024216a064f52.zip ast2050-yocto-poky-ceabaf626538ccdbd06ec4e8d87024216a064f52.tar.gz | |
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.
(From OE-Core rev: d7ddae84165b5b84dc6ac640fd492ade891ddd4e)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 39 |
1 files changed, 9 insertions, 30 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index cf33efd..2ca99ac 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 |
