diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-04-02 09:28:06 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-04-02 09:28:06 +0000 |
| commit | 67f32465d7069eda2597a58677f8543d2a5b5ee8 (patch) | |
| tree | 09a16a96f3b520777774bb807f6c15b7429802ab /classes | |
| parent | 3a7fe39e4b75e390cca05bc3998adaf2e832b2f7 (diff) | |
| parent | 2f8dc919dea77f4b321f4f76a2c8059a6f94fba7 (diff) | |
merge of '7591223f9cc09ec1cac67f361556f5e52509ce2e'
and 'f5edc19dd1057109ae156f97cd6387f3a74993fe'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 5 | ||||
| -rw-r--r-- | classes/sanity.bbclass | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 880295fc30..6f8196cf80 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -32,6 +32,9 @@ def base_chk_file(parser, pn, pv, src_uri, localpath): elif parser.has_section(pn_src): md5 = parser.get(pn_src, "md5") sha256 = parser.get(pn_src, "sha256") + elif parser.has_section(src_uri): + md5 = parser.get(src_uri, "md5") + sha256 = parser.get(src_uri, "sha256") else: return False #raise Exception("Can not find a section for '%s' '%s' and '%s'" % (pn,pv,src_uri)) @@ -51,7 +54,7 @@ def base_chk_file(parser, pn, pv, src_uri, localpath): raise Exception("Executing md5sum failed") try: - shapipe = os.popen('shasum -a256 -p ' + localpath) + shapipe = os.popen('sha256sum -b ' + localpath) shadata = (shapipe.readline().split() or [ "" ])[0] shapipe.close() except OSError: diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 958ab91fa6..f38644b6cb 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -86,7 +86,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk" + required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk sha256sum md5sum" for util in required_utilities.split(): if not check_app_exists( util, e.data ): |