summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2006-04-30 12:29:07 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-30 12:29:07 +0000
commitc1b283fdbcd2e2e224b3c365d0a1937d0637991b (patch)
tree05249f450c3cbc0b25e5914ec53c21c82dad0e72
parentfb482f5c636a163c1eb910275e54c64e3aa03911 (diff)
conf/bitbake.conf:
Save a magic cookie in the OE version of bitbake.conf classes/sanity.bbclass: Check the OE cookie for bitbake.conf
-rw-r--r--classes/sanity.bbclass4
-rw-r--r--conf/bitbake.conf6
2 files changed, 10 insertions, 0 deletions
diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 6af44ee191..8253b27930 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -83,6 +83,10 @@ def check_sanity(e):
if not check_app_exists('texi2html', e.data):
raise_sanity_error('Please install the texi2html binary')
+ oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
+ if not oes_bb_conf:
+ raise_sanity_error('You do not include OpenEmbeddeds version of conf/bitbake.conf')
+
addhandler check_sanity_eventhandler
python check_sanity_eventhandler() {
from bb import note, error, data, __version__
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 77923e8e7f..2043a500eb 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -403,3 +403,9 @@ require conf/sanity.conf
##################################################################
PCMCIA_MANAGER ?= "pcmcia-cs"
+
+
+##################################################################
+# Magic Cookie for SANITY CHECK
+##################################################################
+OES_BITBAKE_CONF = "1"