summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-10-12 12:46:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-10-19 18:02:26 +0100
commit33b31640bf485bcfefee015e9df81aa9989b322c (patch)
tree8289b56e8d7055252d26d5eb496f74217986acec /meta/recipes-qt/qt4
parente9938516240e7ef3b5aeb47690828dd574ba2d8e (diff)
downloadpoky-33b31640bf485bcfefee015e9df81aa9989b322c.tar.gz
PACKAGES_DYNAMIC: use regexp not glob
* bitbake uses PACKAGES_DYNAMIC as regexp ^ could make matching faster (and it will be more clear that we're expecting regexp not glob) * made all those last '-' optional, use .* (or nothing) (From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt4')
-rw-r--r--meta/recipes-qt/qt4/qt4-embedded.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index 3b3768904c..afca7f881f 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -59,7 +59,7 @@ RRECOMMENDS_${QT_BASE_NAME}-demos += " \
59 ${QT_BASE_NAME}-fonts" 59 ${QT_BASE_NAME}-fonts"
60 60
61ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" 61ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1"
62PACKAGES_DYNAMIC += "${QT_BASE_NAME}-fonts-*" 62PACKAGES_DYNAMIC += "^${QT_BASE_NAME}-fonts-.*"
63 63
64FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf" 64FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf"
65FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf" 65FILES_${QT_BASE_NAME}-fonts-ttf-dejavu = "${libdir}/fonts/DejaVu*.ttf"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 35748f86a4..5bc7956120 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -124,7 +124,7 @@ PACKAGES += " \
124 ${STATICDEV_PACKAGES} \ 124 ${STATICDEV_PACKAGES} \
125 ${OTHER_PACKAGES}" 125 ${OTHER_PACKAGES}"
126 126
127PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-*" 127PACKAGES_DYNAMIC = "^${QT_BASE_NAME}-plugin-.* ^${QT_BASE_NAME}-translation-.* ^${QT_BASE_NAME}-phrasebook-.*"
128 128
129ALLOW_EMPTY_${PN} = "1" 129ALLOW_EMPTY_${PN} = "1"
130FILES_${PN} = "" 130FILES_${PN} = ""