summaryrefslogtreecommitdiff
path: root/meta/classes
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-04-22 11:01:22 +0300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2013-05-20 16:06:09 +0100
commit3ef3b5be29925d8b6579c5bd57e58ce1bced35d8 (patch)
treeeb04f63b14d030e46456391f95a5c480da648e9e /meta/classes
parent8ca272168e3cf9abcab13096a3c4eaadb7e35841 (diff)
downloadopenembedded-core-3ef3b5be29925d8b6579c5bd57e58ce1bced35d8.tar.gz
openembedded-core-3ef3b5be29925d8b6579c5bd57e58ce1bced35d8.tar.bz2
openembedded-core-3ef3b5be29925d8b6579c5bd57e58ce1bced35d8.zip
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@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/fontcache.bbclass10
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 0bc309a129..9136c5a886 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() {