diff options
| author | Andre Rosa <andre.rosa@lge.com> | 2017-09-07 11:15:55 +0200 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-01-16 02:28:21 +0000 |
| commit | 49271d4c71039bf5a169d1688d0df3b8babdd848 (patch) | |
| tree | 1b63dd8c2dcb665585fba6e6d8ccdfba91140103 | |
| parent | dfdfdb916f1e25bf618b11ba0a1f1f9a95eefa04 (diff) | |
| download | talos-openbmc-49271d4c71039bf5a169d1688d0df3b8babdd848.tar.gz talos-openbmc-49271d4c71039bf5a169d1688d0df3b8babdd848.zip | |
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>
Signed-off-by: Xo Wang <xow@google.com>
(cherry-picked from unreleased Yocto 2.2.3. Fixes openbmc/openbmc#2608.)
git-subtree-dir: import-layers/yocto-poky
Change-Id: Ib0fc0b9533b3d4813a5843b232f6f0088dacf56a
| -rw-r--r-- | import-layers/yocto-poky/bitbake/lib/bb/fetch2/git.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/git.py b/import-layers/yocto-poky/bitbake/lib/bb/fetch2/git.py index 1bec60ab7..792c18376 100644 --- a/import-layers/yocto-poky/bitbake/lib/bb/fetch2/git.py +++ b/import-layers/yocto-poky/bitbake/lib/bb/fetch2/git.py @@ -327,7 +327,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) |
