summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Rosa <andre.rosa@lge.com>2017-11-03 11:40:14 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-07 13:40:38 (GMT)
commitac4d3fca189c8b6b54647ccfca37c812aad98149 (patch)
tree2e7a2033273f6bc04653350fdaaa5d0010d3a556
parent3f55846839530468f35f7940156713c6d0085495 (diff)
downloadpoky-ac4d3fca189c8b6b54647ccfca37c812aad98149.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: 68d061d2517f1a79dc6b14a373ed2dcb78a901ce) 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> (cherry picked from commit 2ab50074c1a6c56a8a178755de108447d7b7acaf) Signed-off-by: Javier Viguera <javier.viguera@digi.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 9bd87ad..5ac7e9a 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -289,7 +289,7 @@ class Git(FetchMethod):
289 branchname = ud.branches[ud.names[0]] 289 branchname = ud.branches[ud.names[0]]
290 runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \ 290 runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \
291 ud.revisions[ud.names[0]]), d) 291 ud.revisions[ud.names[0]]), d)
292 runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \ 292 runfetchcmd("%s branch %s --set-upstream-to origin/%s" % (ud.basecmd, branchname, \
293 branchname), d) 293 branchname), d)
294 else: 294 else:
295 runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d) 295 runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d)