qt: upstream git branch 5.10.1 disappeared
PATCH 1/1 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.
--- 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(-)
recipes-qt/qt5/qt5-git.inc +2 -1
@@ -2,7 +2,8 @@ # Copyright (C) 2013-2018 Martin Jansa <[email protected]> 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
recipes-qt/qt5/qtknx_git.bb +0 -2
@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"
recipes-qt/qt5/qtmqtt_git.bb +0 -2
@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9"
Signature · 1 line
1.9.4
It would be much nicer if they exist at least on 5.10 branch instead of 5.11 :/.
Pruning origin
URL: git://code.qt.io/qt/qtbase.git
* [pruned] origin/5.10.1
* [pruned] origin/5.9.0
* [pruned] origin/5.9.4
* [pruned] origin/5.9.5
I still don't understand why they delete the branches, the commits are still there, having them reachable from multiple branches doesn't add any significant overhead.
Quoted 68 lines · S. Lockwood-Childs
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 <[email protected]>--- 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(-)recipes-qt/qt5/qt5-git.inc +1
-1@@ -2,7 +2,8 @@ # Copyright (C) 2013-2018 Martin Jansa <[email protected]> QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.10.1" +# branch named 5.10.1 got deleted upstream, but v5.10.1 tag still existson 5.11 branch
recipes-qt/qt5/qt5-git.inc +1
-0+QT_MODULE_BRANCH ?= "5.11" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" # each module needs to define valid SRCREVrecipes-qt/qt5/qtknx_git.bb +0
-2@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"recipes-qt/qt5/qtmqtt_git.bb +0
-3@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9" --1.9.4
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Yes, agreed that would be nicer... I don't understand the point of '5.10' branch, since it doesn't contain *any* of the official v5.10.x release tags!
Quoted 84 lines · Martin Jansa
It would be much nicer if they exist at least on 5.10 branch instead of 5.11 :/.
Pruning origin
URL:git://code.qt.io/qt/qtbase.git
* [pruned] origin/5.10.1
* [pruned] origin/5.9.0
* [pruned] origin/5.9.4
* [pruned] origin/5.9.5I still don't understand why they delete the branches, the commits are still there, having them reachable from multiple branches doesn't add any significant overhead.
Quoted 68 lines · S. Lockwood-Childs
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 <[email protected]>--- 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(-)recipes-qt/qt5/qt5-git.inc +1
-1@@ -2,7 +2,8 @@ # Copyright (C) 2013-2018 Martin Jansa <[email protected]> QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "5.10.1" +# branch named 5.10.1 got deleted upstream, but v5.10.1 tag still existson 5.11 branch
recipes-qt/qt5/qt5-git.inc +1
-0+QT_MODULE_BRANCH ?= "5.11" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" # each module needs to define valid SRCREVrecipes-qt/qt5/qtknx_git.bb +0
-2@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - SRCREV = "29c34e8f072afd01002ed3847d752b4e065f977e"recipes-qt/qt5/qtmqtt_git.bb +0
-3@@ -9,6 +9,4 @@ LIC_FILES_CHKSUM = " \ DEPENDS += "qtbase" -QT_MODULE_BRANCH = "5.10" - SRCREV = "2c3c2a41c55a179332ec2a076856990f36dd5ef9" --1.9.4
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel