From 9e729f1f18867f7ce0fe253711031fa69078abe0 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Mon, 22 Apr 2013 11:01:22 +0300 Subject: 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 rev: 9553874cf02ba443aff1bbead56bacfcda9bb6ca) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/classes/fontcache.bbclass | 10 ++-------- 1 file 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() { -- cgit v1.2.3-54-g00ecf