summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2018-04-05 01:41:40 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-04-05 14:23:05 (GMT)
commit0e730770a9529f2a0b3219efcc1de7e8842105e8 (patch)
treecdaae782cca28eac7e5b1d9a19e7fa21fb2dd139
parentd7897f17b98c0021f8adb9ebeb0d9dd71355b027 (diff)
downloadpoky-0e730770a9529f2a0b3219efcc1de7e8842105e8.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: 7b7cbba0bb93893029118e5798ec5831838a5bd9) 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):
816 machinevalid = True 816 machinevalid = True
817 if d.getVar('MACHINE', True): 817 if d.getVar('MACHINE', True):
818 if not check_conf_exists("conf/machine/${MACHINE}.conf", d): 818 if not check_conf_exists("conf/machine/${MACHINE}.conf", d):
819 status.addresult('Please set a valid MACHINE in your local.conf or environment\n') 819 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)))
820 machinevalid = False 820 machinevalid = False
821 else: 821 else:
822 status.addresult(check_sanity_validmachine(d)) 822 status.addresult(check_sanity_validmachine(d))