Fix sanity check for new abi

current_abi is the abi of the tmp directory, not the current abi specified in
the abi file...

Now the sanity check should work sanely.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 86b8901c55408c7fe7400bb7727228236a069261..364a4e4af980111c47475dc0da6f6034c1075305 100644 (file)
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -166,7 +166,7 @@ def check_sanity(e):
 
                         f = file(abifile, "w")
                         f.write(current_abi)
-                elif current_abi == "5":
+                elif abi == "5" and current_abi != "5":
                         messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"                        
                elif (abi != current_abi):
                        # Code to convert from one ABI to another could go here if possible.