summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-04-14 14:27:29 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-02 15:41:33 +0100
commitdc39ebe91eabc48517aaac98655e50c7b1702262 (patch)
tree49e52b3d469b2e39ec4e2a2a3f6b1e5d2f930a6e
parent22a21799059b156d8858cbf32acb7c2aefb9a23b (diff)
downloadpoky-dc39ebe91eabc48517aaac98655e50c7b1702262.tar.gz
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>
-rw-r--r--bitbake/lib/bb/cooker.py3
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py5
2 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index eaee797cb5..eab95d0336 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -530,6 +530,9 @@ class BBCooker:
530 530
531 bb.data.delVar('LAYERDIR', data) 531 bb.data.delVar('LAYERDIR', data)
532 532
533 if not data.getVar("BBPATH", True):
534 bb.fatal("The BBPATH variable is not set")
535
533 data = bb.parse.handle(os.path.join("conf", "bitbake.conf"), data) 536 data = bb.parse.handle(os.path.join("conf", "bitbake.conf"), data)
534 537
535 self.configuration.data = data 538 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 9188119e4d..9128a2ef8f 100644
--- 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+(.+)" )
37def init(data): 37def init(data):
38 topdir = bb.data.getVar('TOPDIR', data) 38 topdir = bb.data.getVar('TOPDIR', data)
39 if not topdir: 39 if not topdir:
40 topdir = os.getcwd() 40 bb.data.setVar('TOPDIR', os.getcwd(), data)
41 bb.data.setVar('TOPDIR', topdir, data)
42 if not bb.data.getVar('BBPATH', data):
43 bb.msg.fatal(bb.msg.domain.Parsing, "The BBPATH environment variable must be set")
44 41
45 42
46def supports(fn, d): 43def supports(fn, d):