conf/bitbake.conf:

    Save a magic cookie in the OE version of bitbake.conf
classes/sanity.bbclass:
    Check the OE cookie for bitbake.conf

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 6af44ee191a207eb88c4264fe0fa7c6871f6c2eb..8253b27930905ff4bf7aacf64e013afa157a23c7 100644 (file)
--- 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 77923e8e7f84ba3aae7136755b304208f6f97a9d..2043a500eb74e115f70b6b2459de32df5801075c 100644 (file)
--- 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"