fontcache uses quemu usermode by default, but some architecture
such as Intel skylake does not support qemu usermode, this can
lead to a build warning as below:
"WARNING: The postinstall intercept hook 'update_font_cache' failed".
Add a judgement of qemu usermode to fix the build warning.
Signed-off-by: Jibin Xu <jibin...@windriver.com>
---
meta/classes/fontcache.bbclass | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass
index e76331131e..3eb868fa08 100644
--- a/meta/classes/fontcache.bbclass
+++ b/meta/classes/fontcache.bbclass
@@ -17,13 +17,17 @@ FONTCONFIG_CACHE_PARAMS ?= "-v"
FONTCONFIG_CACHE_ENV ?= "FC_DEBUG=1"
fontcache_common() {
if [ -n "$D" ] ; then
- $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG}
mlprefix=${MLPREFIX} \
- 'bindir="${bindir}"' \
- 'libdir="${libdir}"' \
- 'base_libdir="${base_libdir}"' \
- 'fontconfigcachedir="${FONTCONFIG_CACHE_DIR}"' \
- 'fontconfigcacheparams="${FONTCONFIG_CACHE_PARAMS}"' \
- 'fontconfigcacheenv="${FONTCONFIG_CACHE_ENV}"'
+ if ${@bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode',
'true','false', d)}; then
+ $INTERCEPT_DIR/postinst_intercept update_font_cache ${PKG}
mlprefix=${MLPREFIX} \
+ 'bindir="${bindir}"' \
+ 'libdir="${libdir}"' \
+ 'base_libdir="${base_libdir}"' \
+ 'fontconfigcachedir="${FONTCONFIG_CACHE_DIR}"' \
+ 'fontconfigcacheparams="${FONTCONFIG_CACHE_PARAMS}"' \
+ 'fontconfigcacheenv="${FONTCONFIG_CACHE_ENV}"'
+ else
+ exit 1
+ fi
else
${FONTCONFIG_CACHE_ENV} fc-cache ${FONTCONFIG_CACHE_PARAMS}
fi
--
2.13.0
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
