summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-04-22 11:01:24 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-22 14:45:02 +0100
commit5e702edaa4306ba8630d2f06a6672abd24153dc8 (patch)
treec6bdb87afcb06cf45820b62804638cda62687549 /meta/classes
parent6304ba31d5a2d6b1b8f5daaba619f979375f4604 (diff)
downloadpoky-5e702edaa4306ba8630d2f06a6672abd24153dc8.tar.gz
pixbufcache.bbclass: do not exit 1 after installing intercept hook
This will allow to register, in a single postinstall, multiple hooks. (From OE-Core rev: b396138ee081c8f5dddbaab0e374787ba2e31029) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/pixbufcache.bbclass29
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
8 8
9PIXBUF_PACKAGES ??= "${PN}" 9PIXBUF_PACKAGES ??= "${PN}"
10 10
11#
12# On host, the postinstall MUST return 1 because we do not know if the intercept
13# hook will succeed. If it does succeed, than the packages will be marked as
14# installed.
15#
16pixbufcache_common() { 11pixbufcache_common() {
17if [ "x$D" != "x" ]; then 12if [ "x$D" != "x" ]; then
18 $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \ 13 $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \
19 bindir=${bindir} base_libdir=${base_libdir} 14 bindir=${bindir} base_libdir=${base_libdir}
20 exit 1 15else
21fi 16
22 17 # Update the pixbuf loaders in case they haven't been registered yet
23# Update the pixbuf loaders in case they haven't been registered yet 18 GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache
24GDK_PIXBUF_MODULEDIR=${libdir}/gdk-pixbuf-2.0/2.10.0/loaders gdk-pixbuf-query-loaders --update-cache 19
25 20 if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
26if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then 21 for icondir in /usr/share/icons/*; do
27 for icondir in /usr/share/icons/*; do 22 if [ -d ${icondir} ]; then
28 if [ -d ${icondir} ]; then 23 gtk-update-icon-cache -t -q ${icondir}
29 gtk-update-icon-cache -t -q ${icondir} 24 fi
30 fi 25 done
31 done 26 fi
32fi 27fi
33} 28}
34 29