diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-22 16:08:29 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-28 13:45:43 +0100 |
| commit | 4ac0b49b65106c2214ae80517fe9f66630d4540c (patch) | |
| tree | b746ec97749d93f35b2f8b491c4e27f8b9706b76 | |
| parent | 0e88b873e758c158cde11009a8c6f9ca5f7a63dc (diff) | |
| download | openembedded-core-4ac0b49b65106c2214ae80517fe9f66630d4540c.tar.gz | |
base.bbclass: Since we require python 2.6 which always contains hashlib we can drop this fallback code
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 4681489bb4..f390f0804f 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -326,16 +326,6 @@ python () { depends = depends + " osc-native:do_populate_sysroot" bb.data.setVarFlag('do_fetch', 'depends', depends, d) - # bb.utils.sha256_file() will fail if hashlib isn't present, so we fallback - # on shasum-native. We need to ensure that it is staged before we fetch. - if bb.data.getVar('PN', d, True) != "shasum-native": - try: - import hashlib - except ImportError: - depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" - depends = depends + " shasum-native:do_populate_sysroot" - bb.data.setVarFlag('do_fetch', 'depends', depends, d) - # *.xz should depends on xz-native for unpacking # Not endswith because of "*.patch.xz;patch=1". Need bb.decodeurl in future if '.xz' in srcuri: |