sanity: Move variable declarations to sanity.conf to workaround problems with bitbake...

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 08b077a..f0ffa5c 100644 (file)
--- 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 0d494f1..4af4454 100644 (file)
--- 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"