[PATCH 0/1] Check if SDKMACHINE setting has taken effect

[PATCH 0/1] Check if SDKMACHINE setting has taken effect

[Paul Eggleton]

The following change since commit 2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74:

  linux-yocto/3.10: fix qemuarm build failure (2014-03-30 23:52:10 +0100)

is available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib paule/sdkmachine
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/sdkmachine

Paul Eggleton (1):
  classes/sanity: check if SDKMACHINE setting has taken effect

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

-- 
1.9.0

[PATCH 1/1] classes/sanity: check if SDKMACHINE setting has taken effect

[Paul Eggleton]

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@linux.intel.com>
---
 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)
 
-- 
1.9.0