aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-05-09 11:33:40 +0300
committerMartin Jansa <Martin.Jansa@gmail.com>2016-05-09 13:02:12 +0200
commitcbd9331b7acc9b1b53043077993f94bcb9e3f38a (patch)
tree68d734fbe104cab8e7a3f0afab7132e943a51dfd /recipes-qt
parent05e05db305873e35b03cd1adf670e133c1799be1 (diff)
qt5: Allow disabling SHA validation for branch
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.piippo@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt5/qt5-git.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 8f88b6d4..ad0abe88 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.7"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
# 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};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL} \
"
S = "${WORKDIR}/git"