diff options
Diffstat (limited to 'bitbake/lib/bb/fetch2/__init__.py')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index 672f1095dc..5209f4d3dc 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1200,13 +1200,13 @@ class FetchData(object): | |||
1200 | self.sha256_name = "sha256sum" | 1200 | self.sha256_name = "sha256sum" |
1201 | if self.md5_name in self.parm: | 1201 | if self.md5_name in self.parm: |
1202 | self.md5_expected = self.parm[self.md5_name] | 1202 | self.md5_expected = self.parm[self.md5_name] |
1203 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: | 1203 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp", "s3"]: |
1204 | self.md5_expected = None | 1204 | self.md5_expected = None |
1205 | else: | 1205 | else: |
1206 | self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name) | 1206 | self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name) |
1207 | if self.sha256_name in self.parm: | 1207 | if self.sha256_name in self.parm: |
1208 | self.sha256_expected = self.parm[self.sha256_name] | 1208 | self.sha256_expected = self.parm[self.sha256_name] |
1209 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: | 1209 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp", "s3"]: |
1210 | self.sha256_expected = None | 1210 | self.sha256_expected = None |
1211 | else: | 1211 | else: |
1212 | self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name) | 1212 | self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name) |
@@ -1791,6 +1791,7 @@ from . import svn | |||
1791 | from . import wget | 1791 | from . import wget |
1792 | from . import ssh | 1792 | from . import ssh |
1793 | from . import sftp | 1793 | from . import sftp |
1794 | from . import s3 | ||
1794 | from . import perforce | 1795 | from . import perforce |
1795 | from . import bzr | 1796 | from . import bzr |
1796 | from . import hg | 1797 | from . import hg |
@@ -1808,6 +1809,7 @@ methods.append(gitannex.GitANNEX()) | |||
1808 | methods.append(cvs.Cvs()) | 1809 | methods.append(cvs.Cvs()) |
1809 | methods.append(ssh.SSH()) | 1810 | methods.append(ssh.SSH()) |
1810 | methods.append(sftp.SFTP()) | 1811 | methods.append(sftp.SFTP()) |
1812 | methods.append(s3.S3()) | ||
1811 | methods.append(perforce.Perforce()) | 1813 | methods.append(perforce.Perforce()) |
1812 | methods.append(bzr.Bzr()) | 1814 | methods.append(bzr.Bzr()) |
1813 | methods.append(hg.Hg()) | 1815 | methods.append(hg.Hg()) |