summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Rosa <andre.rosa@lge.com>2017-09-07 11:15:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-07 13:38:57 +0000
commit6da3e0a0abf1251db243548639979f8d74e99766 (patch)
tree291c0d8ee278932d872288ba68b5a9a4ba4cbb70
parent1d92cb1a20135cfffff9f94a6633ec0840518738 (diff)
downloadpoky-6da3e0a0abf1251db243548639979f8d74e99766.tar.gz
bitbake: Replace deprecated git branch parameter "--set-upstream"
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: 991b533f1d61042a7b3edd1fbf3dea0bf9991606) Signed-off-by: Andre Rosa <andre.rosa@lge.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/fetch2/git.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 1bec60ab71..792c183763 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -327,7 +327,7 @@ class Git(FetchMethod):
327 branchname = ud.branches[ud.names[0]] 327 branchname = ud.branches[ud.names[0]]
328 runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ 328 runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \
329 ud.revisions[ud.names[0]]), d, workdir=destdir) 329 ud.revisions[ud.names[0]]), d, workdir=destdir)
330 runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ 330 runfetchcmd("%s branch %s --set-upstream-to origin/%s" % (ud.basecmd, branchname, \
331 branchname), d, workdir=destdir) 331 branchname), d, workdir=destdir)
332 else: 332 else:
333 runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir) 333 runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir)