diff options
| author | Ross Burton <ross@openedhand.com> | 2008-05-06 15:43:12 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2008-05-06 15:43:12 +0000 |
| commit | 8076a7b88a5865bc08175fbd9f37a422c7b38f28 (patch) | |
| tree | 258d63d0f2976422783be799d1676a89bbcf6106 /meta/classes | |
| parent | 71f93951ee7fb92ee413812a8eb010e48de98ba8 (diff) | |
| download | poky-8076a7b88a5865bc08175fbd9f37a422c7b38f28.tar.gz | |
base.bbclass: don't add shasum-native dependency if we are building shasum-native
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4444 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/base.bbclass | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index d27f0d3c5d..6b0e50bd6a 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
| @@ -980,12 +980,13 @@ def base_after_parse(d): | |||
| 980 | 980 | ||
| 981 | # bb.utils.sha256_file() will fail if hashlib isn't present, so we fallback | 981 | # bb.utils.sha256_file() will fail if hashlib isn't present, so we fallback |
| 982 | # on shasum-native. We need to ensure that it is staged before we fetch. | 982 | # on shasum-native. We need to ensure that it is staged before we fetch. |
| 983 | try: | 983 | if bb.data.getVar('PN', d, True) != "shasum-native": |
| 984 | import hashlib | 984 | try: |
| 985 | except ImportError: | 985 | import hashlib |
| 986 | depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" | 986 | except ImportError: |
| 987 | depends = depends + " shasum-native:do_populate_staging" | 987 | depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" |
| 988 | bb.data.setVarFlag('do_fetch', 'depends', depends, d) | 988 | depends = depends + " shasum-native:do_populate_staging" |
| 989 | bb.data.setVarFlag('do_fetch', 'depends', depends, d) | ||
| 989 | 990 | ||
| 990 | mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1) | 991 | mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1) |
| 991 | old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1) | 992 | old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1) |