From 371a224c1ee6e105ac5969a35373d47b2ac70265 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Jun 2011 16:08:29 +0100 Subject: base.bbclass: Since we require python 2.6 which always contains hashlib we can drop this fallback code (From OE-Core rev: 4ac0b49b65106c2214ae80517fe9f66630d4540c) Signed-off-by: Richard Purdie Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'meta/classes/base.bbclass') 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: -- cgit v1.2.3-54-g00ecf