Re: [meta-qt5][PATCH] qt5: Allow disabling SHA validation for branch

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2049 bytes --]

On Wed, Apr 20, 2016 at 04:51:02PM +0300, Samuli Piippo wrote:
> 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>
> ---
>  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"

Why not put whole ";nobranch=1" here (and empty by default) to keep the SRC_URI shorter for
recipe versions which don't have this issue?

Or even
QT_MODULE_BRANCH_PARAM = "branch=${QT_MODULE_BRANCH}"

which your recipes can replace with nobranch=1 and SRC_URI will stay
simple:

${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}

>  # 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

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]