summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-04-28 17:48:08 +0100
committerJoshua Lock <josh@linux.intel.com>2010-04-28 17:48:08 +0100
commit19a81653b707adc2440d1f8eb194c1bcb0ae9d50 (patch)
tree3de5eecb663420bf27452c4ee2af649567fedaf3
parent6458da896fffe33ab5db8cc2606e8225e16b0f36 (diff)
downloadopenembedded-core-19a81653b707adc2440d1f8eb194c1bcb0ae9d50.tar.gz
openembedded-core-19a81653b707adc2440d1f8eb194c1bcb0ae9d50.tar.bz2
openembedded-core-19a81653b707adc2440d1f8eb194c1bcb0ae9d50.tar.xz
openembedded-core-19a81653b707adc2440d1f8eb194c1bcb0ae9d50.zip
Bump the ABI to alert people that cross has gone
Since we've change the tmpdir layout quite a bit we're going to bump ABI and force a rebuild. Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/conf/abi_version.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 67a5f52de..86b8901c5 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -166,6 +166,8 @@ def check_sanity(e):
f = file(abifile, "w")
f.write(current_abi)
+ elif 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.
messages = messages + "Error, TMPDIR has changed ABI (%s to %s) and you need to either rebuild, revert or adjust it at your own risk.\n" % (abi, current_abi)
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index a3287a56f..e679aaa9c 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
# that breaks the format and have been previously discussed on the mailing list
# with general agreement from the core team.
#
-OELAYOUT_ABI = "4"
+OELAYOUT_ABI = "5"