[OE-core] [PATCH] sanity.bbclass: Add syntax check on MACHINE variable
Baptiste DURAND
baptiste.durand at gmail.com
Tue Mar 3 11:01:17 UTC 2015
MACHINE variable should not contain uppercase characters.
Having uppercase in Machine name can lead to this kind of error : (here Machine is set to nuc-E3815)
ERROR: initramfs-live-boot not found in the base feeds (nuc_E3815 corei7-64-intel-common corei7-64 core2-64 x86_64 noarch any all).
Signed-off-by: Baptiste DURAND <baptiste.durand at gmail.com>
---
meta/classes/sanity.bbclass | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 31b99d4..1fa2e58 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -713,12 +713,17 @@ def check_sanity_everybuild(status, d):
# Check that the MACHINE is valid, if it is set
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')
- machinevalid = False
+ machinevar = d.getVar('MACHINE', True)
+ if machinevar:
+ if machinevar == machinevar.lower():
+ if not check_conf_exists("conf/machine/${MACHINE}.conf", d):
+ status.addresult('Please set a valid MACHINE in your local.conf or environment\n')
+ machinevalid = False
+ else:
+ status.addresult(check_sanity_validmachine(d))
else:
- status.addresult(check_sanity_validmachine(d))
+ status.addresult('Please set a valid MACHINE : uppercase characters are not allowed in machine name : ${MACHINE} should be ' + machinevar.lower() + ' \n Please rename file conf/machine/${MACHINE}.conf as conf/machine/' + machinevar.lower() + '.conf\n')
+ machinevalid = False
else:
status.addresult('Please set a MACHINE in your local.conf or environment\n')
machinevalid = False
--
1.8.1.4
More information about the Openembedded-core
mailing list