Move the unset BBPATH sanity check after the bblayers processing

This way we can fully utilize bblayers, you can do everything in bblayers.conf
and avoid setting any environment variables at all.

(Bitbake rev: 5def1c8c31432968349f9b29d6333d7962260a8b)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index eaee797cb53c3fb0de2cf4debd4c30ba71340f35..eab95d03364f7f44ed7ba1931852167d20850e8c 100644 (file)
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -530,6 +530,9 @@ class BBCooker:
 
                 bb.data.delVar('LAYERDIR', data)
 
+            if not data.getVar("BBPATH", True):
+                bb.fatal("The BBPATH variable is not set")
+
             data = bb.parse.handle(os.path.join("conf", "bitbake.conf"), data)
 
             self.configuration.data = data

diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index 9188119e4d4326001e8c9603bb0ea23bb061e2ab..9128a2ef8fc57d9afcd15f8e058940fde331bbb9 100644 (file)
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -37,10 +37,7 @@ __export_regexp__ = re.compile( r"export\s+(.+)" )
 def init(data):
     topdir = bb.data.getVar('TOPDIR', data)
     if not topdir:
-        topdir = os.getcwd()
-        bb.data.setVar('TOPDIR', topdir, data)
-    if not bb.data.getVar('BBPATH', data):
-        bb.msg.fatal(bb.msg.domain.Parsing, "The BBPATH environment variable must be set")
+        bb.data.setVar('TOPDIR', os.getcwd(), data)
 
 
 def supports(fn, d):