diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-04-22 11:01:24 +0300 |
|---|---|---|
| committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-05-20 16:06:09 +0100 |
| commit | 3daed9c994d3f092caa9cc6e8bab49ab606cb0a2 (patch) | |
| tree | d9f7f39db8b71f2cc2b5e1ef2756a0141920f57f | |
| parent | 982302219bf5b133f76a0d8213b626f8abef99b3 (diff) | |
| download | openembedded-core-3daed9c994d3f092caa9cc6e8bab49ab606cb0a2.tar.gz openembedded-core-3daed9c994d3f092caa9cc6e8bab49ab606cb0a2.tar.bz2 openembedded-core-3daed9c994d3f092caa9cc6e8bab49ab606cb0a2.zip | |
pixbufcache.bbclass: do not exit 1 after installing intercept hook
This will allow to register, in a single postinstall, multiple hooks.
(From OE-Core master rev: b396138ee081c8f5dddbaab0e374787ba2e31029)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/pixbufcache.bbclass | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index 3c34557227..4e0f57729c 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -8,27 +8,22 @@ inherit qemu PIXBUF_PACKAGES ??= "${PN}" -# -# 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. -# pixbufcache_common() { if [ "x$D" != "x" ]; then $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \ bindir=${bindir} base_libdir=${base_libdir} - exit 1 -fi - -# Update the pixbuf loaders in case they haven't been registered yet -GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache - -if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then - for icondir in /usr/share/icons/*; do - if [ -d ${icondir} ]; then - gtk-update-icon-cache -t -q ${icondir} - fi - done +else + + # Update the pixbuf loaders in case they haven't been registered yet + GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache + + if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then + for icondir in /usr/share/icons/*; do + if [ -d ${icondir} ]; then + gtk-update-icon-cache -t -q ${icondir} + fi + done + fi fi } |