summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 67a5f52..86b8901 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -166,6 +166,8 @@ 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":
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"
169 elif (abi != current_abi): 171 elif (abi != current_abi):
170 # 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.
171 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) 173 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 a3287a5..e679aaa 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
4# that breaks the format and have been previously discussed on the mailing list 4# that breaks the format and have been previously discussed on the mailing list
5# with general agreement from the core team. 5# with general agreement from the core team.
6# 6#
7OELAYOUT_ABI = "4" 7OELAYOUT_ABI = "5"