[oe-commits] [openembedded-core] branch morty updated: sanity.bbclass: Improved error message

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch morty
in repository openembedded-core.

The following commit(s) were added to refs/heads/morty by this push:
     new 7b7cbba  sanity.bbclass: Improved error message
7b7cbba is described below

commit 7b7cbba0bb93893029118e5798ec5831838a5bd9
Author: Juro Bystricky <juro.bystricky at intel.com>
AuthorDate: Wed Apr 4 18:41:40 2018 -0700

    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 at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit a7cb408dd784178197687a2129e936620bf6a0d3)
    Signed-off-by: Andre McCurdy <armccurdy at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/sanity.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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))

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.