]> code.ossystems Code Review - openembedded-core.git/commitdiff
fontcache.bbclass: use the postinst_intercept script
authorLaurentiu Palcu <laurentiu.palcu@intel.com>
Tue, 12 Feb 2013 16:12:40 +0000 (18:12 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 12 Feb 2013 16:35:14 +0000 (16:35 +0000)
"Link" the package to the postinstall hook by running the
postinst_intercept script.

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

index 83817356c3d2ea73cea760777079737ebfa15ff2..d3c1562f2439c2021919c7241509a97acc03b941 100644 (file)
@@ -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