diff options
author | Juro Bystricky <juro.bystricky@intel.com> | 2017-01-12 14:07:58 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-17 11:31:36 +0000 |
commit | fe84f7b33e817728dfea0210fc2b94a90f636ce3 (patch) | |
tree | 5bf19d6ebc6b39de47c0ffd77cc64c49bf9351a6 | |
parent | 7fbd940e8934e08f9c1b4d28c320e50cb5c72adf (diff) | |
download | poky-fe84f7b33e817728dfea0210fc2b94a90f636ce3.tar.gz |
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]
(From OE-Core rev: a7cb408dd784178197687a2129e936620bf6a0d3)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/sanity.bbclass | 2 |
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): | |||
823 | machinevalid = True | 823 | machinevalid = True |
824 | if d.getVar('MACHINE'): | 824 | if d.getVar('MACHINE'): |
825 | if not check_conf_exists("conf/machine/${MACHINE}.conf", d): | 825 | if not check_conf_exists("conf/machine/${MACHINE}.conf", d): |
826 | status.addresult('Please set a valid MACHINE in your local.conf or environment\n') | 826 | status.addresult('MACHINE=%s is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.\n' % (d.getVar('MACHINE'))) |
827 | machinevalid = False | 827 | machinevalid = False |
828 | else: | 828 | else: |
829 | status.addresult(check_sanity_validmachine(d)) | 829 | status.addresult(check_sanity_validmachine(d)) |