From cbd9331b7acc9b1b53043077993f94bcb9e3f38a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 9 May 2016 11:33:40 +0300 Subject: 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 Signed-off-by: Martin Jansa --- recipes-qt/qt5/qt5-git.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'recipes-qt/qt5') 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" -- cgit v1.2.3-54-g00ecf