[bitbake-devel] [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"

[Viguera, Javier]

Hi all,

Last night Ubuntu 16 updated git to version 2.15, and now this is biting us (and I guess many other people in the wild) on releases based on Morty and Jethro.

I did a basic test and for bitbake 1.32 (Poky Morty) and 1.34 (Poky Pyro)  a simple cherry-pick works just fine without conflicts:

git cherry-pick -x 2ab50074c1a6c56a8a178755de108447d7b7acaf

So could someone do those cherry-picks in bitbake and then move those fixes to Poky Pyro and Morty stable braches?

For previous versions the cherry-pick does not apply cleanly. I'll try to find the time and send a proper patch for 1.30 (Krogoth) and 1.28 (Jethro).

Thanks in advance.

--
Javier Viguera
Software Engineer
Digi International® Spain S.A.U.


-----Original Message-----
From: bitbake-devel-bounces at lists.openembedded.org [mailto:bitbake-devel-bounces at lists.openembedded.org] On Behalf Of André Draszik
Sent: Wednesday, October 18, 2017 8:52 AM
To: bitbake-devel at lists.openembedded.org
Subject: [bitbake-devel] [1.34][PATCH] Replace deprecated git branch parameter "--set-upstream"

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

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 2ab50074c1a6c56a8a178755de108447d7b7acaf)
Signed-off-by: André Draszik <adraszik at tycoint.com>
---
 lib/bb/fetch2/git.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 2550bde8..7442f844 100644
--- a/lib/bb/fetch2/git.py
+++ b/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

--
_______________________________________________
bitbake-devel mailing list
bitbake-devel at lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel