Patchwork [1/4] fontcache.bbclass: do not exit with 1 after installing intercept hook

login
register
mail settings
Submitter Laurentiu Palcu
Date April 22, 2013, 8:01 a.m.
Message ID <cba51f6bd4486e894e639f876a2ba466c1d000c0.1366615922.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/48605/
State Accepted
Commit 9e729f1f18867f7ce0fe253711031fa69078abe0
Headers show

Comments

Laurentiu Palcu - April 22, 2013, 8:01 a.m.
This will allow to register, in a single postinstall, multiple hooks.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta/classes/fontcache.bbclass |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

Patch

diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index 0bc309a..9136c5a 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() {