summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sanity.bbclass10
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 2742dada7d..a5f935c893 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -65,8 +65,9 @@ def check_sanity(e):
65 if data.getVar('TARGET_OS', e.data, True) == 'INVALID': 65 if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
66 messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n' 66 messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n'
67 67
68 assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
68 # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf 69 # Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
69 if "diffstat-native" not in data.getVar('ASSUME_PROVIDED', e.data, True).split(): 70 if "diffstat-native" not in assume_provided:
70 messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n' 71 messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
71 72
72 # Check that the MACHINE is valid 73 # Check that the MACHINE is valid
@@ -96,10 +97,11 @@ def check_sanity(e):
96 missing = missing + "%s," % util 97 missing = missing + "%s," % util
97 98
98 # qemu-native needs gcc 3.x 99 # qemu-native needs gcc 3.x
99 gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '") 100 if "qemu-native" not in assume_provided:
101 gcc_version = commands.getoutput("${BUILD_PREFIX}gcc --version | head -n 1 | cut -f 3 -d ' '")
100 102
101 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': 103 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':
102 missing = missing + "gcc-3.x (needed for qemu-native)," 104 missing = missing + "gcc-3.x (needed for qemu-native),"
103 105
104 if missing != "": 106 if missing != "":
105 missing = missing.rstrip(',') 107 missing = missing.rstrip(',')