[oe-commits] Laurentiu Palcu : fontcache.bbclass: do not exit with 1 after installing intercept hook

git at git.openembedded.org git at git.openembedded.org
Wed May 22 16:08:51 UTC 2013


Module: openembedded-core.git
Branch: dylan
Commit: 3ef3b5be29925d8b6579c5bd57e58ce1bced35d8
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3ef3b5be29925d8b6579c5bd57e58ce1bced35d8

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Mon Apr 22 11:01:22 2013 +0300

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

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

(From OE-Core master rev: 9553874cf02ba443aff1bbead56bacfcda9bb6ca)

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

---

 meta/classes/fontcache.bbclass |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 0bc309a..9136c5a 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() {



More information about the Openembedded-commits mailing list