[oe-commits] Laurentiu Palcu : fontcache.bbclass: use the postinst_intercept script

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: a14faa3b9c55574a096d517431393e4ac3c86823
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a14faa3b9c55574a096d517431393e4ac3c86823

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Tue Feb 12 18:12:40 2013 +0200

fontcache.bbclass: use the postinst_intercept script

"Link" the package to the postinstall hook by running the
postinst_intercept script.

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

---

 meta/classes/fontcache.bbclass |   20 +++++++-------------
 1 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 8381735..d3c1562 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -8,21 +8,15 @@ 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
-	if [ ! -f $INTERCEPT_DIR/update_font_cache ]; then
-		cat << "EOF" > $INTERCEPT_DIR/update_font_cache
-#!/bin/sh
-
-${@qemu_run_binary(d, '$D', '/usr/bin/fc-cache')} --sysroot=$D >/dev/null 2>&1
-
-if [ $? -ne 0 ]; then
-    exit 1
-fi
-
-EOF
-	fi
-	exit 0
+	$INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir}
+	exit 1
 fi
 
 fc-cache