]> code.ossystems Code Review - openembedded-core.git/commitdiff
base.bbclass: Since we require python 2.6 which always contains hashlib we can drop...
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 22 Jun 2011 15:08:29 +0000 (16:08 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 28 Jun 2011 12:45:43 +0000 (13:45 +0100)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/base.bbclass

index 4681489bb412d1785c07d85af972320e533e0f21..f390f0804f29eaca8e8de13aa320b24089aaafef 100644 (file)
@@ -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: