[PATCH 0/2] A couple of fixes for sanity.bbclass

[PATCH 0/2] A couple of fixes for sanity.bbclass

[Paul Eggleton]

The following changes since commit 9f0453c29891e32f8038c4bbc22ada28bfbf818a:

  lib/oe/sstatesig.py: add signature data query function (2012-09-10 13:03:45 +0100)

are available in the git repository at:

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

Paul Eggleton (2):
  classes/sanity: skip tune checks if machine is invalid
  classes/sanity: remove obsolete code

 meta/classes/sanity.bbclass |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

-- 
1.7.9.5

[PATCH 1/2] classes/sanity: skip tune checks if machine is invalid

[Paul Eggleton]

If there is no valid machine configuration it's almost guaranteed that
the tune checks will fail, so just suppress them in that case.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/sanity.bbclass |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 8f42fca..1210f14 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':
-- 
1.7.9.5

[PATCH 2/2] classes/sanity: remove obsolete code

[Paul Eggleton]

We can now rely upon the minimum BitBake version having the
SanityCheckFailed event, so remove the code to handle if this is not
there.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/sanity.bbclass |    9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 1210f14..385d733 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -6,13 +6,8 @@ SANITY_REQUIRED_UTILITIES ?= "patch diffstat makeinfo git bzip2 tar gzip gawk ch
 
 def raise_sanity_error(msg, d):
     if d.getVar("SANITY_USE_EVENTS", True) == "1":
-        # FIXME: handle when BitBake version is too old to support bb.event.SanityCheckFailed
-        # We can just fire the event directly once the minimum version is bumped beyond 1.15.1
-        try:
-            bb.event.fire(bb.event.SanityCheckFailed(msg), d)
-            return
-        except AttributeError:
-            pass
+        bb.event.fire(bb.event.SanityCheckFailed(msg), d)
+        return
 
     bb.fatal(""" OE-core's config sanity checker detected a potential misconfiguration.
     Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
-- 
1.7.9.5

Re: [PATCH 0/2] A couple of fixes for sanity.bbclass

[Saul Wold]

On 09/11/2012 02:40 AM, Paul Eggleton wrote:
> The following changes since commit 9f0453c29891e32f8038c4bbc22ada28bfbf818a:
>
>    lib/oe/sstatesig.py: add signature data query function (2012-09-10 13:03:45 +0100)
>
> are available in the git repository at:
>
>    git://git.openembedded.org/openembedded-core-contrib paule/sanityfixes
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/sanityfixes
>
> Paul Eggleton (2):
>    classes/sanity: skip tune checks if machine is invalid
>    classes/sanity: remove obsolete code
>
>   meta/classes/sanity.bbclass |   19 +++++++++----------
>   1 file changed, 9 insertions(+), 10 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!