From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Date: Mon, 22 Apr 2013 08:01:22 +0000 (+0300)
Subject: fontcache.bbclass: do not exit with 1 after installing intercept hook
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~37608
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9553874cf02ba443aff1bbead56bacfcda9bb6ca;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

fontcache.bbclass: do not exit with 1 after installing intercept hook

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

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 0bc309a1299..9136c5a8869 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -8,19 +8,13 @@ inherit qemu
 
 FONT_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.
-#
 fontcache_common() {
 if [ "x$D" != "x" ] ; then
 	$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} \
 		libdir=${libdir} base_libdir=${base_libdir}
-	exit 1
+else
+	fc-cache
 fi
-
-fc-cache
 }
 
 python populate_packages_append() {