From 6537d43d0fb9c7a946d7f93f0a8b5f846f35dacd Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 7 Oct 2014 05:18:28 +0200 Subject: [PATCH] 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 (From meta-qt5 rev: 478fe949a957471a4d20450f6e9375fe1d628591) Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- meta-qt5/recipes-qt/qt5/qtbase.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-qt5/recipes-qt/qt5/qtbase.inc b/meta-qt5/recipes-qt/qt5/qtbase.inc index 176aec4..389d356 100644 --- a/meta-qt5/recipes-qt/qt5/qtbase.inc +++ b/meta-qt5/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 +} -- 2.7.4