diff options
Diffstat (limited to 'meta/classes/sanity.bbclass')
-rw-r--r-- | meta/classes/sanity.bbclass | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 8b5526075c..957e24e1e1 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass | |||
@@ -24,14 +24,6 @@ def check_conf_exists(fn, data): | |||
24 | return True | 24 | return True |
25 | return False | 25 | return False |
26 | 26 | ||
27 | def check_app_exists(app, d): | ||
28 | from bb import which, data | ||
29 | |||
30 | app = data.expand(app, d) | ||
31 | path = data.getVar('PATH', d) | ||
32 | return len(which(path, app)) != 0 | ||
33 | |||
34 | |||
35 | def check_sanity(e): | 27 | def check_sanity(e): |
36 | from bb import note, error, data, __version__ | 28 | from bb import note, error, data, __version__ |
37 | from bb.event import Handled, NotHandled, getName | 29 | from bb.event import Handled, NotHandled, getName |
@@ -96,7 +88,7 @@ def check_sanity(e): | |||
96 | if "qemu-native" not in assume_provided: | 88 | if "qemu-native" not in assume_provided: |
97 | gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") | 89 | gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") |
98 | 90 | ||
99 | if not check_app_exists('gcc-3.4', e.data) and not check_app_exists('gcc-3.3', e.data) and gcc_version[0] != '3': | 91 | if not check_gcc3(e.data) and gcc_version[0] != '3': |
100 | missing = missing + "gcc-3.x (needed for qemu-native)," | 92 | missing = missing + "gcc-3.x (needed for qemu-native)," |
101 | else: | 93 | else: |
102 | required_utilities = required_utilities + " qemu-arm" | 94 | required_utilities = required_utilities + " qemu-arm" |