diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-04-17 20:50:36 +0800 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-04-20 10:04:04 +0000 |
| commit | 7a52f924a0298857db99be20aca1484bb2b4e163 (patch) | |
| tree | f3278b981b6baea142394d8c03767386abb67cf1 | |
| parent | f48752cc10266ffedee451813ceceec3e67c167f (diff) | |
packagegroup-qt5-toolchain-target/qttranslations: fix nothing provides qttranslations-qtconfig
It failed to build meta-toolchain-qt5:
...
Error:
Problem: conflicting requests
- nothing provides qttranslations-qtconfig needed by packagegroup-qt5-toolchain-target-1.0-r0.noarch
...
The upstream removed qtconfig translations:
...
commit a6b3446cb023e7b3a5f8aa12ea0d650d2b804334
Author: Alexander Volkov <a.volkov@rusbitech.ru>
Date: Thu Sep 14 19:33:25 2017 +0300
Remove qtconfig translations
...
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
| -rwxr-xr-x | recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qttranslations_git.bb | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb index 234cde8c..df805146 100755 --- a/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb +++ b/recipes-qt/packagegroups/packagegroup-qt5-toolchain-target.bb @@ -45,7 +45,6 @@ RDEPENDS_${PN} += " \ qtbase-staticdev \ qttranslations-qt \ qttranslations-qtbase \ - qttranslations-qtconfig \ qttranslations-qthelp \ qtconnectivity-dev \ qtconnectivity-mkspecs \ diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb index 59949cfa..88a390f9 100644 --- a/recipes-qt/qt5/qttranslations_git.bb +++ b/recipes-qt/qt5/qttranslations_git.bb @@ -22,7 +22,6 @@ PACKAGES =. " \ ${PN}-qtwebsockets \ ${PN}-qtwebengine \ ${PN}-qtxmlpatterns \ - ${PN}-qtconfig \ ${PN}-qtquick1 \ ${PN}-qtscript \ ${PN}-qtserialport \ @@ -83,10 +82,6 @@ FILES_${PN}-qtxmlpatterns = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtxmlpatterns_*.qm \ " -FILES_${PN}-qtconfig = " \ - ${OE_QMAKE_PATH_TRANSLATIONS}/qtconfig_*.qm \ -" - FILES_${PN}-qtquick1 = " \ ${OE_QMAKE_PATH_TRANSLATIONS}/qtquick1_*.qm \ " |