diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2016-03-09 00:53:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 22:45:16 +0000 |
commit | aebc22dbfade9a107f1a05e42bf7fe3887c15ae8 (patch) | |
tree | 65ab4f90af6f4de4cbb23eaa59dafcf77ddc9a88 /bitbake/lib/bb/fetch2 | |
parent | d405f97af32d82b1b82915fa0b7038d4ac79f410 (diff) | |
download | poky-aebc22dbfade9a107f1a05e42bf7fe3887c15ae8.tar.gz |
bitbake: fetch2: Make SRC_URI[md5sum] and SRC_URI[sha256sum] expand their values
For some reason, the values for SRC_URI[md5sum] and SRC_URI[sha256sum]
were not being expanded. That lead to the following code not working
as expected:
SRC_URI = "http://.../${PN}-${PV}.tar.gz"
MD5SUM = "123abc..."
SHA256SUM = "abcd1234..."
SRC_URI[md5sum] = "${MD5SUM}"
SRC_URI[sha256sum] = "${SHA256SUM}"
(Bitbake rev: ba011470df0ea8bd89f01c0b02ec4b3969e60ce7)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/fetch2')
-rw-r--r-- | bitbake/lib/bb/fetch2/__init__.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py index e8d3af72e8..f86014cbf1 100644 --- a/bitbake/lib/bb/fetch2/__init__.py +++ b/bitbake/lib/bb/fetch2/__init__.py | |||
@@ -1153,13 +1153,13 @@ class FetchData(object): | |||
1153 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: | 1153 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: |
1154 | self.md5_expected = None | 1154 | self.md5_expected = None |
1155 | else: | 1155 | else: |
1156 | self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name, False) | 1156 | self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name, True) |
1157 | if self.sha256_name in self.parm: | 1157 | if self.sha256_name in self.parm: |
1158 | self.sha256_expected = self.parm[self.sha256_name] | 1158 | self.sha256_expected = self.parm[self.sha256_name] |
1159 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: | 1159 | elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]: |
1160 | self.sha256_expected = None | 1160 | self.sha256_expected = None |
1161 | else: | 1161 | else: |
1162 | self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name, False) | 1162 | self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name, True) |
1163 | self.ignore_checksums = False | 1163 | self.ignore_checksums = False |
1164 | 1164 | ||
1165 | self.names = self.parm.get("name",'default').split(',') | 1165 | self.names = self.parm.get("name",'default').split(',') |