summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2017-01-12 14:07:58 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-17 11:31:31 +0000
commita7cb408dd784178197687a2129e936620bf6a0d3 (patch)
treedffd06cbd6a33a19ff2874a5f27bc36a475a7294
parentca46c09d38b766b69f485f1e82fc78f2a5e6a4c8 (diff)
downloadopenembedded-core-contrib-a7cb408dd784178197687a2129e936620bf6a0d3.tar.gz
openembedded-core-contrib-a7cb408dd784178197687a2129e936620bf6a0d3.tar.bz2
openembedded-core-contrib-a7cb408dd784178197687a2129e936620bf6a0d3.zip
sanity.bbclass: Improved error message
When a non-existing MACHINE is specified, sanity check issues the following message: Please set a valid MACHINE in your local.conf or environment However, MACHINE can also be set in multiconfig .conf file(s). Hence we may have several different MACHINE settings within one (multiconfig) build, so the present error message is fairly ambiguous. This patch remedies this by explicitly naming the offending MACHINE and by amending the list of places where this erroneous MACHINE definition could have originated. MACHINE=xyz is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file. [YOCTO#10810] Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/sanity.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index c876dc6c83..c9bb0349ad 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -823,7 +823,7 @@ def check_sanity_everybuild(status, d):
machinevalid = True
if d.getVar('MACHINE'):
if not check_conf_exists("conf/machine/${MACHINE}.conf", d):
- status.addresult('Please set a valid MACHINE in your local.conf or environment\n')
+ status.addresult('MACHINE=%s is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.\n' % (d.getVar('MACHINE')))
machinevalid = False
else:
status.addresult(check_sanity_validmachine(d))