From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-qt5][PATCH] qt5: Allow disabling SHA validation for branch
Date: Tue, 26 Apr 2016 12:04:30 +0200 [thread overview]
Message-ID: <20160426100430.GA2559@jama> (raw)
In-Reply-To: <1461160262-4752-1-git-send-email-samuli.piippo@qt.io>
[-- 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 --]
prev parent reply other threads:[~2016-04-26 10:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-20 13:51 [meta-qt5][PATCH] qt5: Allow disabling SHA validation for branch Samuli Piippo
2016-04-26 10:04 ` Martin Jansa [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160426100430.GA2559@jama \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox