diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-04-22 11:01:22 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-22 17:13:52 +0100 |
commit | 4f47f899dd1086e5c10f8bc28946f7a08f613277 (patch) | |
tree | df5e70c6e38a8694431aab6ae6589c4aad45d48a /meta/classes/fontcache.bbclass | |
parent | 006ed65f51a39d328feccd4d6c28864e8d26f537 (diff) | |
download | poky-4f47f899dd1086e5c10f8bc28946f7a08f613277.tar.gz |
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)
(From OE-Core rev: 3ef3b5be29925d8b6579c5bd57e58ce1bced35d8)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/fontcache.bbclass')
-rw-r--r-- | meta/classes/fontcache.bbclass | 10 |
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 | |||
8 | 8 | ||
9 | FONT_PACKAGES ??= "${PN}" | 9 | FONT_PACKAGES ??= "${PN}" |
10 | 10 | ||
11 | # | ||
12 | # On host, the postinstall MUST return 1 because we do not know if the intercept | ||
13 | # hook will succeed. If it does succeed, than the packages will be marked as | ||
14 | # installed. | ||
15 | # | ||
16 | fontcache_common() { | 11 | fontcache_common() { |
17 | if [ "x$D" != "x" ] ; then | 12 | if [ "x$D" != "x" ] ; then |
18 | $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} \ | 13 | $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG} bindir=${bindir} \ |
19 | libdir=${libdir} base_libdir=${base_libdir} | 14 | libdir=${libdir} base_libdir=${base_libdir} |
20 | exit 1 | 15 | else |
16 | fc-cache | ||
21 | fi | 17 | fi |
22 | |||
23 | fc-cache | ||
24 | } | 18 | } |
25 | 19 | ||
26 | python populate_packages_append() { | 20 | python populate_packages_append() { |