summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-12-15 06:53:00 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-12-15 06:53:00 +0000
commit056fde7111b5143d4bb45883da38263a5772d332 (patch)
treed6c84e1915544255397af8054089879a34f8811e
parent5a5c55e4cc9916cfa4a6cc5eeca5b2e906047d57 (diff)
parentc415ee0b42783845087f27f2c8c003ca34d65ca5 (diff)
merge of '35986a7295900068759ed5a0148b77d46c088c66'
and '3afbe0b60ab4c00ea448ef08a1d2f4da08be3465'
-rw-r--r--classes/sanity.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 479abce7fa..cc413b7011 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -70,8 +70,9 @@ def check_sanity(e):
if "diffstat-native" not in assume_provided:
messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
- # Check that the MACHINE is valid
- if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+ # Check that the MACHINE is valid, if it is set
+ if data.getVar('MACHINE', e.data, True):
+ if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
messages = messages + 'Please set a valid MACHINE in your local.conf\n'
# Check that the DISTRO is valid