From: Joshua Lock <josh@linux.intel.com>
Date: Thu, 29 Apr 2010 09:25:39 +0000 (+0100)
Subject: Fix sanity check for new abi
X-Git-Tag: 2011-1~6012
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=69d788ad5eecf5cb0e28f8283364cce9753a8a58;p=openembedded-core.git

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 86b8901c55..364a4e4af9 100644
--- 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.