summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-07-24 11:10:33 +0000
committerRichard Purdie <richard@openedhand.com>2008-07-24 11:10:33 +0000
commit8beb43ca485fb9b408f9445d9185a2ba89d1a154 (patch)
tree2f222f89a3e321c8233d5f2b50f8abacdcbca2e1 /meta
parent09d8aa054f6a854f5c394a787e1c8196303660e3 (diff)
downloadopenembedded-core-8beb43ca485fb9b408f9445d9185a2ba89d1a154.tar.gz
openembedded-core-8beb43ca485fb9b408f9445d9185a2ba89d1a154.tar.bz2
openembedded-core-8beb43ca485fb9b408f9445d9185a2ba89d1a154.tar.xz
openembedded-core-8beb43ca485fb9b408f9445d9185a2ba89d1a154.zip
Move SANITY_ABI to its own file and give a more general name
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4938 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-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 2de023f96..0193a7352 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 000000000..a6704254d
--- /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 bf74c998b..8d596ca31 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 e5fe74894..7cc348ec9 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"