aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-02-12 18:12:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-13 16:52:29 +0000
commitb4c89bdae3778f2bf7596c1f3ca9fdaf7d480614 (patch)
tree7927d5a15f1d229b043e167478a8e7de3f07be5d /meta
parentceabaf626538ccdbd06ec4e8d87024216a064f52 (diff)
downloadopenembedded-core-contrib-b4c89bdae3778f2bf7596c1f3ca9fdaf7d480614.tar.gz
fontcache.bbclass: use the postinst_intercept script
"Link" the package to the postinstall hook by running the postinst_intercept script. (From OE-Core rev: a14faa3b9c55574a096d517431393e4ac3c86823) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/fontcache.bbclass20
1 files changed, 7 insertions, 13 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 83817356c3..d3c1562f24 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