Qt releases are done from a release branch (5.x.x), which is later merged
back to a stable branch (5.x) and then removed. When a recipe is updated
to use the released SHA from the release branch, it will eventually break
when the release branch is removed. This happens because bitbake tries to
validate that given SHA is found from the given branch. Add additional
variable that can be used to disable the SHA check when branch is known
to be later removed, but SHA remains valid.

Signed-off-by: Samuli Piippo <samuli.pii...@qt.io>
---
 recipes-qt/qt5/qt5-git.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 8a6d93e..1805551 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -3,10 +3,11 @@
 
 QT_MODULE ?= "${BPN}"
 QT_MODULE_BRANCH ?= "5.6"
+QT_MODULE_NOBRANCH ?= "0"
 
 # each module needs to define valid SRCREV
 SRC_URI = " \
-    
${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL}
 \
+    
${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};nobranch=${QT_MODULE_NOBRANCH};branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL}
 \
 "
 
 S = "${WORKDIR}/git"
-- 
1.9.1

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Reply via email to