diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2012-10-12 12:46:38 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-10-19 18:01:16 +0100 |
| commit | 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064 (patch) | |
| tree | e2e7bc727efb69b206fcd899afad5aea6fbaca93 /meta/recipes-qt | |
| parent | 199298b6b114db09fd8ff100642ae101050a2e9a (diff) | |
| download | openembedded-core-2f3ebdfa5f42dae51063b043cc4b0fbe20b40064.tar.gz openembedded-core-2f3ebdfa5f42dae51063b043cc4b0fbe20b40064.tar.bz2 openembedded-core-2f3ebdfa5f42dae51063b043cc4b0fbe20b40064.zip | |
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)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
| -rw-r--r-- | meta/recipes-qt/qt-apps/qmmp_0.6.1.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb index 9522d88e12..15273f7873 100644 --- a/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb +++ b/meta/recipes-qt/qt-apps/qmmp_0.6.1.bb @@ -26,7 +26,7 @@ export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ " -PACKAGES_DYNAMIC = "qmmp-plugin-* " +PACKAGES_DYNAMIC = "^qmmp-plugin-.* " python populate_packages_prepend () { 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 += " \ ${QT_BASE_NAME}-fonts" ALLOW_EMPTY_${QT_BASE_NAME}-fonts = "1" -PACKAGES_DYNAMIC += "${QT_BASE_NAME}-fonts-*" +PACKAGES_DYNAMIC += "^${QT_BASE_NAME}-fonts-.*" FILES_${QT_BASE_NAME}-fonts-ttf-vera = "${libdir}/fonts/Vera*.ttf" FILES_${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 += " \ ${STATICDEV_PACKAGES} \ ${OTHER_PACKAGES}" -PACKAGES_DYNAMIC = "${QT_BASE_NAME}-plugin-* ${QT_BASE_NAME}-translation-* ${QT_BASE_NAME}-phrasebook-*" +PACKAGES_DYNAMIC = "^${QT_BASE_NAME}-plugin-.* ^${QT_BASE_NAME}-translation-.* ^${QT_BASE_NAME}-phrasebook-.*" ALLOW_EMPTY_${PN} = "1" FILES_${PN} = "" |