summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-22 16:08:29 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-28 13:55:39 +0100
commit371a224c1ee6e105ac5969a35373d47b2ac70265 (patch)
treee7cc89c36c5538442ab4c0256c34e134ed554165 /meta/classes/base.bbclass
parentcc3455fd9c7dfab40eff22d502fa144ef0bd231b (diff)
downloadpoky-371a224c1ee6e105ac5969a35373d47b2ac70265.tar.gz
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 <richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass10
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 () {
326 depends = depends + " osc-native:do_populate_sysroot" 326 depends = depends + " osc-native:do_populate_sysroot"
327 bb.data.setVarFlag('do_fetch', 'depends', depends, d) 327 bb.data.setVarFlag('do_fetch', 'depends', depends, d)
328 328
329 # bb.utils.sha256_file() will fail if hashlib isn't present, so we fallback
330 # on shasum-native. We need to ensure that it is staged before we fetch.
331 if bb.data.getVar('PN', d, True) != "shasum-native":
332 try:
333 import hashlib
334 except ImportError:
335 depends = bb.data.getVarFlag('do_fetch', 'depends', d) or ""
336 depends = depends + " shasum-native:do_populate_sysroot"
337 bb.data.setVarFlag('do_fetch', 'depends', depends, d)
338
339 # *.xz should depends on xz-native for unpacking 329 # *.xz should depends on xz-native for unpacking
340 # Not endswith because of "*.patch.xz;patch=1". Need bb.decodeurl in future 330 # Not endswith because of "*.patch.xz;patch=1". Need bb.decodeurl in future
341 if '.xz' in srcuri: 331 if '.xz' in srcuri: