From 19a81653b707adc2440d1f8eb194c1bcb0ae9d50 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 28 Apr 2010 17:48:08 +0100 Subject: 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 --- meta/classes/sanity.bbclass | 2 ++ meta/conf/abi_version.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'meta') 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" -- cgit v1.2.3