diff options
| -rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 7 | ||||
| -rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 9fec705ad6..f53467e73b 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
| @@ -555,6 +555,9 @@ class FetchData(object): | |||
| 555 | if not self.method: | 555 | if not self.method: |
| 556 | raise NoMethodError(url) | 556 | raise NoMethodError(url) |
| 557 | 557 | ||
| 558 | if hasattr(self.method, "urldata_init"): | ||
| 559 | self.method.urldata_init(self, d) | ||
| 560 | |||
| 558 | if self.method.supports_srcrev(): | 561 | if self.method.supports_srcrev(): |
| 559 | self.revisions = {} | 562 | self.revisions = {} |
| 560 | for name in self.names: | 563 | for name in self.names: |
| @@ -564,8 +567,8 @@ class FetchData(object): | |||
| 564 | if len(self.names) == 1: | 567 | if len(self.names) == 1: |
| 565 | self.revision = self.revisions[self.names[0]] | 568 | self.revision = self.revisions[self.names[0]] |
| 566 | 569 | ||
| 567 | if hasattr(self.method, "urldata_init"): | 570 | if hasattr(self.method, "fixuprevisions"): |
| 568 | self.method.urldata_init(self, d) | 571 | self.method.fixuprevisions(self, d) |
| 569 | 572 | ||
| 570 | if "localpath" in self.parm: | 573 | if "localpath" in self.parm: |
| 571 | # if user sets localpath for file, use it instead. | 574 | # if user sets localpath for file, use it instead. |
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 1679f81511..553e1281f2 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
| @@ -72,15 +72,16 @@ class Git(FetchMethod): | |||
| 72 | 72 | ||
| 73 | ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git" | 73 | ud.basecmd = data.getVar("FETCHCMD_git", d, True) or "git" |
| 74 | 74 | ||
| 75 | ud.write_tarballs = (data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0" | ||
| 76 | |||
| 77 | ud.localfile = ud.clonedir | ||
| 78 | |||
| 79 | def fixuprevisions(self, ud, d): | ||
| 75 | for name in ud.names: | 80 | for name in ud.names: |
| 76 | # Ensure anything that doesn't look like a sha256 checksum/revision is translated into one | 81 | # Ensure anything that doesn't look like a sha256 checksum/revision is translated into one |
| 77 | if not ud.revisions[name] or len(ud.revisions[name]) != 40 or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]): | 82 | if not ud.revisions[name] or len(ud.revisions[name]) != 40 or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]): |
| 78 | ud.revisions[name] = self.latest_revision(ud.url, ud, d, name) | 83 | ud.revisions[name] = self.latest_revision(ud.url, ud, d, name) |
| 79 | 84 | ||
| 80 | ud.write_tarballs = (data.getVar("BB_GENERATE_MIRROR_TARBALLS", d, True) or "0") != "0" | ||
| 81 | |||
| 82 | ud.localfile = ud.clonedir | ||
| 83 | |||
| 84 | def localpath(self, url, ud, d): | 85 | def localpath(self, url, ud, d): |
| 85 | return ud.clonedir | 86 | return ud.clonedir |
| 86 | 87 | ||
