diff options
| author | S. Lockwood-Childs <sjl@vctlabs.com> | 2018-06-08 15:33:32 -0700 |
|---|---|---|
| committer | Otavio Salvador <otavio@ossystems.com.br> | 2018-06-22 19:09:50 -0300 |
| commit | 7e72e9166fa7dc7f36084b2544b9acee688b52cd (patch) | |
| tree | 10b52568a80413e52bba3ff30cef53da10c0b39f | |
| parent | eb943c529b0be8ab83111d776c24d63423afc016 (diff) | |
qt: upstream git branch 5.10.1 disappeared
The branch called 5.10.1 no longer exists at code.qt.io repos.
The corresponding v5.10.1 qt tags still exist (at least on those repos
that originally got tagged during the release), and they are available
on the 5.11 branch. Thus we can keep Qt source at 5.10.1 commits, but
use 5.11 branch to check out those specific commits.
This could be a bit confusing, making it look like 5.11 is the current
default version for recipes, so for now there is a comment in qt5-git.inc
trying to clarify the situation.
A couple of repos that already were lacking 5.10.1 branch no longer
need to override QT_MODULE_BRANCH, since their chosen commits are
also available on 5.11 branch.
Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
| -rw-r--r-- | recipes-qt/qt5/qt5-git.inc | 3 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtknx_git.bb | 2 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtmqtt_git.bb | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc index beba9135..ae508716 100644 --- a/recipes-qt/qt5/qt5-git.inc +++ b/recipes-qt/qt5/qt5-git.inc @@ -2,7 +2,8 @@ # Copyright (C) 2013-2018 Martin Jansa <martin.jansa@gmail.com> QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.10.1" +# branch named 5.10.1 got deleted upstream, but v5.10.1 tag still exists on 5.11 branch +QT_MODULE_BRANCH ?= "5.11" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" # each module needs to define valid SRCREV diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index fa981abb..5e01e3c9 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb @@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e" diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 90c255d7..b705f7c4 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb @@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9" |