summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-02-23 18:07:14 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-02-23 18:07:14 +0000
commit6ca016b5ae51f6384315e5648915d0e94a48ba97 (patch)
tree295955d48a6009524e4e4937659b3d07acef1db9
parentb0eea426509435ed161626a73d37894d475d374c (diff)
sanity: Move variable declarations to sanity.conf to workaround problems with bitbake 1.8.10
-rw-r--r--classes/sanity.bbclass9
-rw-r--r--conf/sanity.conf10
2 files changed, 10 insertions, 9 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 08b077a1e1..f0ffa5c31a 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -2,15 +2,6 @@
# Sanity check the users setup for common misconfigurations
#
-#
-# 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 = "0"
-SANITY_ABIFILE = "${TMPDIR}/abi_version"
-
def raise_sanity_error(msg):
import bb
bb.fatal(""" Openembedded's config sanity checker detected a potential misconfiguration.
diff --git a/conf/sanity.conf b/conf/sanity.conf
index 0d494f1409..4af4454e2e 100644
--- a/conf/sanity.conf
+++ b/conf/sanity.conf
@@ -4,5 +4,15 @@
#
# 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 = "0"
+SANITY_ABIFILE = "${TMPDIR}/abi_version"
+
INHERIT += "sanity"