[yocto] [pyro][bitbake][PATCH] bitbake: Replace deprecated git branch parameter "--set-upstream"

[Martin Jansa]

It should go to bitbake-devel ML and the subject should say bitbake branch
(which is 1.34 not pyro).

On Tue, Oct 17, 2017 at 3:31 PM, André Draszik <git at andred.net> wrote:

> From: Andre Rosa <andre.rosa at lge.com>
>
> Since 2017-08-17 (git version 2.14.1.473.g3ec7d702a) using deprecated
> git branch parameter "--set-upstream" causes a fetcher error. Replace
> it by "--set-upstream-to".
>
> https://git.kernel.org/pub/scm/git/git.git/commit/?id=
> 52668846ea2d41ffbd87cda7cb8e492dea9f2c4d
> says, it's deprecated since 2012-08-30 so hopefully all still supported
> host distributions have new enough git to support "--set-upstream-to".
>
> ERROR: PACKAGE do_unpack: Fetcher failure: ...;
> git -c core.fsyncobjectfiles=0 branch --set-upstream master origin/master
> failed with exit code 128, output:
> fatal: the '--set-upstream' option is no longer supported. Please use
> '--track' or '--set-upstream-to' instead.
>
> ERROR: PACKAGE do_unpack: Function failed: base_do_unpack
>
> (Bitbake rev: 2ab50074c1a6c56a8a178755de108447d7b7acaf)
>
> Signed-off-by: Andre Rosa <andre.rosa at lge.com>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
>
> (cherry picked from commit 20d0282c6048fe11b303e538dbf9109ccb0c467d)
> Signed-off-by: André Draszik <adraszik at tycoint.com>
> ---
>  bitbake/lib/bb/fetch2/git.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
> index 2550bde838..7442f84414 100644
> --- a/bitbake/lib/bb/fetch2/git.py
> +++ b/bitbake/lib/bb/fetch2/git.py
> @@ -326,7 +326,7 @@ class Git(FetchMethod):
>                  branchname =  ud.branches[ud.names[0]]
>                  runfetchcmd("%s checkout -B %s %s" % (ud.basecmd,
> branchname, \
>                              ud.revisions[ud.names[0]]), d,
> workdir=destdir)
> -                runfetchcmd("%s branch --set-upstream %s origin/%s" %
> (ud.basecmd, branchname, \
> +                runfetchcmd("%s branch %s --set-upstream-to origin/%s" %
> (ud.basecmd, branchname, \
>                              branchname), d, workdir=destdir)
>              else:
>                  runfetchcmd("%s checkout %s" % (ud.basecmd,
> ud.revisions[ud.names[0]]), d, workdir=destdir)
> --
> 2.15.0.rc1
>
> --
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20171017/7e61a9f0/attachment.html>