aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2014-10-07 05:18:28 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2014-10-08 17:52:08 +0200
commit478fe949a957471a4d20450f6e9375fe1d628591 (patch)
tree97a46eab906e20427a8360ec119751381dbf41cf
parentbe2d4815efd7b8312700a426a5cafcd86a93666b (diff)
qtbase: don't stage the fonts directory
* the staged files conflict with fonts staged by qt4-embedded and we don't need them in sysroot at all Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--recipes-qt/qt5/qtbase.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc
index 176aec41..389d356b 100644
--- a/recipes-qt/qt5/qtbase.inc
+++ b/recipes-qt/qt5/qtbase.inc
@@ -249,3 +249,8 @@ FILES_${PN}-fonts-pfb = "${OE_QMAKE_PATH_LIBS}/fonts/*.pfb"
FILES_${PN}-fonts-qpf = "${OE_QMAKE_PATH_LIBS}/fonts/*.qpf*"
FILES_${PN}-fonts = "${OE_QMAKE_PATH_LIBS}/fonts/README \
${OE_QMAKE_PATH_LIBS}/fonts/fontdir"
+
+sysroot_stage_dirs_append() {
+ # $to is 2nd parameter passed to sysroot_stage_dir, e.g. ${SYSROOT_DESTDIR} passed from sysroot_stage_all
+ rm -rf $to${OE_QMAKE_PATH_LIBS}/fonts
+}