[oe] [sumo][meta-qt5][PATCH] qt: upstream git branch 5.10.1 disappeared

S. Lockwood-Childs sjl at vctlabs.com
Fri Jun 8 22:50:36 UTC 2018


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 at vctlabs.com>
---
 recipes-qt/qt5/qt5-git.inc   | 3 ++-
 recipes-qt/qt5/qtknx_git.bb  | 2 --
 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 beba913..ae50871 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 at 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 fa981ab..5e01e3c 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 90c255d..b705f7c 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"
-- 
1.9.4




More information about the Openembedded-devel mailing list