4 files changed, 9 insertions, 8 deletions

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 2de023f962..0193a73528 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -141,7 +141,7 @@ def check_sanity(e):
         #
         # Check the 'ABI' of TMPDIR
         #
-        current_abi = data.getVar('SANITY_ABI', e.data, True)
+        current_abi = data.getVar('OELAYOUT_ABI', e.data, True)
         abifile = data.getVar('SANITY_ABIFILE', e.data, True)
         if os.path.exists(abifile):
                 f = file(abifile, "r")
diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
new file mode 100644
index 0000000000..a6704254d4
--- /dev/null
+++ b/meta/conf/abi_version.conf
@@ -0,0 +1,7 @@
+#
+# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in 
+# an incompatible way. Such changes should usually be detailed in the commit
+# that breaks the format and have been previously discussed on the mailing list 
+# with general agreement from the core team.
+#
+OELAYOUT_ABI = "2"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index bf74c998bb..8d596ca31e 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -576,6 +576,7 @@ include conf/machine/${MACHINE}.conf
 include conf/distro/${DISTRO}.conf
 include conf/documentation.conf
 require conf/sanity.conf
+require conf/abi_version.conf
 
 ##################################################################
 # Weak variables (usually to retain backwards compatibility)
diff --git a/meta/conf/sanity.conf b/meta/conf/sanity.conf
index e5fe74894d..7cc348ec94 100644
--- a/meta/conf/sanity.conf
+++ b/meta/conf/sanity.conf
@@ -5,13 +5,6 @@
 # Expert users can confirm their sanity with "touch conf/sanity.conf"
 BB_MIN_VERSION = "1.8.10"
 
-#
-# SANITY_ABI allows us to notify users when the format of TMPDIR changes in 
-# an incompatible way. Such changes should usually be detailed in the commit
-# that breaks the format and have been previously discussed on the mailing list 
-# with general agreement from the core team.
-#
-SANITY_ABI = "2"
 SANITY_ABIFILE = "${TMPDIR}/abi_version"
 
 INHERIT += "sanity"