diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-04-22 11:01:22 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-22 14:45:02 +0100 |
| commit | 9e729f1f18867f7ce0fe253711031fa69078abe0 (patch) | |
| tree | 4a553b9b0a0bacaa6b1722cac2e81ca6c7d76aa2 | |
| parent | 3b2d8e52ee4391802cff7baf3f343700499859ce (diff) | |
| download | poky-9e729f1f18867f7ce0fe253711031fa69078abe0.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 rev: 9553874cf02ba443aff1bbead56bacfcda9bb6ca)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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() { |
