summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/sanity.bbclass2
-rw-r--r--meta/conf/abi_version.conf7
-rw-r--r--meta/conf/bitbake.conf1
-rw-r--r--meta/conf/sanity.conf7
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):
141 # 141 #
142 # Check the 'ABI' of TMPDIR 142 # Check the 'ABI' of TMPDIR
143 # 143 #
144 current_abi = data.getVar('SANITY_ABI', e.data, True) 144 current_abi = data.getVar('OELAYOUT_ABI', e.data, True)
145 abifile = data.getVar('SANITY_ABIFILE', e.data, True) 145 abifile = data.getVar('SANITY_ABIFILE', e.data, True)
146 if os.path.exists(abifile): 146 if os.path.exists(abifile):
147 f = file(abifile, "r") 147 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 @@
1#
2# OELAYOUT_ABI allows us to notify users when the format of TMPDIR changes in
3# an incompatible way. Such changes should usually be detailed in the commit
4# that breaks the format and have been previously discussed on the mailing list
5# with general agreement from the core team.
6#
7OELAYOUT_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
576include conf/distro/${DISTRO}.conf 576include conf/distro/${DISTRO}.conf
577include conf/documentation.conf 577include conf/documentation.conf
578require conf/sanity.conf 578require conf/sanity.conf
579require conf/abi_version.conf
579 580
580################################################################## 581##################################################################
581# Weak variables (usually to retain backwards compatibility) 582# 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 @@
5# Expert users can confirm their sanity with "touch conf/sanity.conf" 5# Expert users can confirm their sanity with "touch conf/sanity.conf"
6BB_MIN_VERSION = "1.8.10" 6BB_MIN_VERSION = "1.8.10"
7 7
8#
9# SANITY_ABI allows us to notify users when the format of TMPDIR changes in
10# an incompatible way. Such changes should usually be detailed in the commit
11# that breaks the format and have been previously discussed on the mailing list
12# with general agreement from the core team.
13#
14SANITY_ABI = "2"
15SANITY_ABIFILE = "${TMPDIR}/abi_version" 8SANITY_ABIFILE = "${TMPDIR}/abi_version"
16 9
17INHERIT += "sanity" 10INHERIT += "sanity"