[bitbake-devel] [PATCH 1/2] fetch2/gitsm.py: Disable branch checking on submodules

Stefan Agner stefan at agner.ch
Wed Nov 7 12:54:35 UTC 2018


On 31.10.2018 20:21, Mark Hatle wrote:
> Submodules by definition refer to a specific commit, not branch.  If we don't
> ignore the branch, then any commits on a submodule on a branch different then
> the original module will trigger a failure that the commit is not on the
> branch.
> 
> Signed-off-by: Mark Hatle <mark.hatle at windriver.com>

Thanks Mark, this seems to also fix the regression I mentioned a couple
of days ago:
http://lists.openembedded.org/pipermail/bitbake-devel/2018-October/009691.html

Tested-by: Stefan Agner <stefan at agner.ch>

--
Stefan

> ---
>  lib/bb/fetch2/gitsm.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/bb/fetch2/gitsm.py b/lib/bb/fetch2/gitsm.py
> index 0a982da..dbfa3a4 100644
> --- a/lib/bb/fetch2/gitsm.py
> +++ b/lib/bb/fetch2/gitsm.py
> @@ -92,7 +92,7 @@ class GitSM(Git):
>              url = uris[module].replace('%s:' % proto, 'gitsm:', 1)
>              url += ';protocol=%s' % proto
>              url += ";name=%s" % module
> -            url += ";bareclone=1;nocheckout=1"
> +            url += ";bareclone=1;nocheckout=1;nobranch=1"
>  
>              ld = d.createCopy()
>              # Not necessary to set SRC_URI, since we're passing the URI to
> -- 
> 1.8.3.1



More information about the bitbake-devel mailing list