diff options
author | Joshua Lock <josh@linux.intel.com> | 2010-04-29 10:25:39 +0100 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2010-04-29 10:25:39 +0100 |
commit | 69d788ad5eecf5cb0e28f8283364cce9753a8a58 (patch) | |
tree | 241ab5bddc5492abc83472e954a7044cd6251b62 | |
parent | 19a81653b707adc2440d1f8eb194c1bcb0ae9d50 (diff) | |
download | poky-69d788ad5eecf5cb0e28f8283364cce9753a8a58.tar.gz |
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>
-rw-r--r-- | meta/classes/sanity.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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): | |||
166 | 166 | ||
167 | f = file(abifile, "w") | 167 | f = file(abifile, "w") |
168 | f.write(current_abi) | 168 | f.write(current_abi) |
169 | elif current_abi == "5": | 169 | elif abi == "5" and current_abi != "5": |
170 | 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" | 170 | 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" |
171 | elif (abi != current_abi): | 171 | elif (abi != current_abi): |
172 | # Code to convert from one ABI to another could go here if possible. | 172 | # Code to convert from one ABI to another could go here if possible. |