From fd572e8c6bf1e2bb466cc6f38f9bd89df0c7d148 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 11 Sep 2012 10:40:14 +0100 Subject: classes/sanity: skip tune checks if machine is invalid If there is no valid machine configuration it's almost guaranteed that the tune checks will fail, so just suppress them in that case. (From OE-Core rev: 629c585e687cda9290efcffd18dd92fdf16009ab) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 8f42fcad35..1210f14ddc 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -320,13 +320,16 @@ def check_sanity(sanity_data): messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, bb.__version__) # Check that the MACHINE is valid, if it is set + machinevalid = True if sanity_data.getVar('MACHINE', True): if not check_conf_exists("conf/machine/${MACHINE}.conf", sanity_data): messages = messages + 'Please set a valid MACHINE in your local.conf or environment\n' + machinevalid = False else: messages = messages + check_sanity_validmachine(sanity_data) else: messages = messages + 'Please set a MACHINE in your local.conf or environment\n' + machinevalid = False # Check we are using a valid lacal.conf current_conf = sanity_data.getVar('CONF_VERSION', True) @@ -428,9 +431,10 @@ def check_sanity(sanity_data): messages = messages + pseudo_msg + '\n' check_supported_distro(sanity_data) - toolchain_msg = check_toolchain(sanity_data) - if toolchain_msg != "": - messages = messages + toolchain_msg + '\n' + if machinevalid: + toolchain_msg = check_toolchain(sanity_data) + if toolchain_msg != "": + messages = messages + toolchain_msg + '\n' # Check if DISPLAY is set if IMAGETEST is set if not sanity_data.getVar( 'DISPLAY', True ) and sanity_data.getVar( 'IMAGETEST', True ) == 'qemu': -- cgit v1.2.3-54-g00ecf