[oe-commits] org.oe.dev sanity: Move variable declarations to sanity.conf to workaround problems with bitbake 1.8.10

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 5744cdb7ad43a125c73b2dd57d51ded57a140c60
ViewMTN: http://monotone.openembedded.org/revision/info/5744cdb7ad43a125c73b2dd57d51ded57a140c60
Files:
1
classes/sanity.bbclass
conf/sanity.conf
Diffs:

#
# mt diff -ra1325c045806757b622ff6366c2b7ceaf111ffb1 -r5744cdb7ad43a125c73b2dd57d51ded57a140c60
#
# 
# 
# patch "classes/sanity.bbclass"
#  from [17eaa6a6a031b90e039f0607d801649c4c1c56b4]
#    to [7c5340af69fe3211497c811df2af7c17db7e435a]
# 
# patch "conf/sanity.conf"
#  from [8074d545842c568a6a98bad4358a6da7c037e6c6]
#    to [19e2e5d9bfa5113b4c25577b445fd588b4a0999b]
# 
============================================================
--- classes/sanity.bbclass	17eaa6a6a031b90e039f0607d801649c4c1c56b4
+++ classes/sanity.bbclass	7c5340af69fe3211497c811df2af7c17db7e435a
@@ -1,16 +1,7 @@
 #
 # 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.
============================================================
--- conf/sanity.conf	8074d545842c568a6a98bad4358a6da7c037e6c6
+++ conf/sanity.conf	19e2e5d9bfa5113b4c25577b445fd588b4a0999b
@@ -1,8 +1,18 @@ BB_MIN_VERSION = "1.8.10"
 # Sanity checks for common user misconfigurations
 #
 # See sanity.bbclass
 #
 # 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"