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>
This commit is contained in:
S. Lockwood-Childs
2018-06-08 15:33:32 -07:00
committed by Otavio Salvador
parent eb943c529b
commit 7e72e9166f
3 changed files with 2 additions and 5 deletions

View File

@@ -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

View File

@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
QT_MODULE_BRANCH = "5.10"
SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"

View File

@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
QT_MODULE_BRANCH = "5.10"
SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9"