diff options
author | Christopher Larson <kergoth@gmail.com> | 2017-05-13 02:46:26 +0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-02 13:36:57 +0100 |
commit | ab4e578b86efcf533c43dfa76e97ea98cd9a5808 (patch) | |
tree | f8bbda21f1379d29ac0aa56efc444a16f9895389 /bitbake/lib/bb/fetch2/git.py | |
parent | 60ade6074e8b1320f72c7d011b13bac9fa7f874e (diff) | |
download | poky-ab4e578b86efcf533c43dfa76e97ea98cd9a5808.tar.gz |
bitbake: fetch: support multiple mirror tarball filenames
Remove ud.mirrortarball in favor of ud.mirrortarballs. Each tarball will be
attempted, in order, and the first available will be used. This is needed for
git shallow mirror tarball support, as we want to be able to use either
a shallow or full mirror tarball.
(Bitbake rev: 02eebee6709e57b523862257f75929e64f16d6b0)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2/git.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 2550bde838..01d4bbdc2e 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
@@ -205,8 +205,9 @@ class Git(FetchMethod): | |||
205 | if ud.rebaseable: | 205 | if ud.rebaseable: |
206 | for name in ud.names: | 206 | for name in ud.names: |
207 | gitsrcname = gitsrcname + '_' + ud.revisions[name] | 207 | gitsrcname = gitsrcname + '_' + ud.revisions[name] |
208 | ud.mirrortarball = 'git2_%s.tar.gz' % gitsrcname | 208 | mirrortarball = 'git2_%s.tar.gz' % gitsrcname |
209 | ud.fullmirror = os.path.join(d.getVar("DL_DIR"), ud.mirrortarball) | 209 | ud.fullmirror = os.path.join(d.getVar("DL_DIR"), mirrortarball) |
210 | ud.mirrortarballs = [mirrortarball] | ||
210 | gitdir = d.getVar("GITDIR") or (d.getVar("DL_DIR") + "/git2/") | 211 | gitdir = d.getVar("GITDIR") or (d.getVar("DL_DIR") + "/git2/") |
211 | ud.clonedir = os.path.join(gitdir, gitsrcname) | 212 | ud.clonedir = os.path.join(gitdir, gitsrcname) |
212 | 213 | ||