mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

pixbufcache.bbclass: do not exit 1 after installing intercept hook

Browse Source 
This will allow to register, in a single postinstall, multiple hooks.

(From OE-Core master rev: b396138ee081c8f5dddbaab0e374787ba2e31029)

(From OE-Core rev: 3daed9c994d3f092caa9cc6e8bab49ab606cb0a2)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Laurentiu Palcu
2013-04-22 11:01:24 +03:00
committed by Richard Purdie
parent 5006fcfb8f
commit 690b8a1811
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/pixbufcache.bbclass
+10 -15
View File
@@ -8,27 +8,22 @@ inherit qemu
PIXBUF_PACKAGES ??= "${PN}" 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() { pixbufcache_common() {
if [ "x$D" != "x" ]; then if [ "x$D" != "x" ]; then
$INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \ $INTERCEPT_DIR/postinst_intercept update_pixbuf_cache ${PKG} libdir=${libdir} \
bindir=${bindir} base_libdir=${base_libdir} bindir=${bindir} base_libdir=${base_libdir}
exit 1 else
fi
# Update the pixbuf loaders in case they haven't been registered yet # 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 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 if [ -x ${bindir}/gtk-update-icon-cache ] && [ -d ${datadir}/icons ]; then
for icondir in /usr/share/icons/*; do for icondir in /usr/share/icons/*; do
if [ -d ${icondir} ]; then if [ -d ${icondir} ]; then
gtk-update-icon-cache -t -q ${icondir} gtk-update-icon-cache -t -q ${icondir}
fi fi
done done
fi
fi fi
} }