mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 18:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes/sanity: skip tune checks if machine is invalid

Browse Source 
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2012-09-11 10:40:14 +01:00
committed by Richard Purdie
parent f20b8ffc5c
commit fd572e8c6b
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
meta/classes/sanity.bbclass
View File

@@ -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':