[oe-commits] Paul Eggleton : classes/sanity: check if SDKMACHINE setting has taken effect

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 25ba4042ae782016aaf1cb5d3dac09b2a1030a1e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=25ba4042ae782016aaf1cb5d3dac09b2a1030a1e

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Mar 31 11:29:36 2014 +0100

classes/sanity: check if SDKMACHINE setting has taken effect

If you try to set SDKMACHINE in a distro configuration file, it won't
take effect because by the time that is parsed the line in bitbake.conf
which includes the appropriate conf file for SDKMACHINE has already been
parsed. Check that SDK_ARCH has changed from its default value and show
an error if it hasn't in order to catch this misconfiguration.

Fixes [YOCTO #5861].

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/sanity.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index cf514d0..69d6a24 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -667,6 +667,8 @@ def check_sanity_everybuild(status, d):
     if d.getVar('SDKMACHINE', True):
         if not check_conf_exists("conf/machine-sdk/${SDKMACHINE}.conf", d):
             status.addresult('Specified SDKMACHINE value is not valid\n')
+        elif d.getVar('SDK_ARCH', False) == "${BUILD_ARCH}":
+            status.addresult('SDKMACHINE is set, but SDK_ARCH has not been changed as a result - SDKMACHINE may have been set too late (e.g. in the distro configuration)\n')
 
     check_supported_distro(d)