aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2018-04-04 18:41:40 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 15:22:59 +0100
commit7b7cbba0bb93893029118e5798ec5831838a5bd9 (patch)
treeb2851bf2f1554877e415a4c9847a9813734aa3d3
parentccf97c35f6153abc639f01c4940dda5e6e8a3fbe (diff)
downloadopenembedded-core-morty.zip
openembedded-core-morty.tar.gz
openembedded-core-morty.tar.bz2
sanity.bbclass: Improved error messagemorty
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> (cherry picked from commit a7cb408dd784178197687a2129e936620bf6a0d3) Signed-off-by: Andre McCurdy <armccurdy@gmail.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 a11b581..68fd440 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -816,7 +816,7 @@ def check_sanity_everybuild(status, d):
machinevalid = True
if d.getVar('MACHINE', True):
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', True)))
machinevalid = False
else:
status.addresult(check_sanity_validmachine(d))