diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-04-14 14:27:29 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-06-04 13:13:18 -0700 |
| commit | 75875baa5b4074c49bbef0042d07dbe69f75d79e (patch) | |
| tree | 28a029a9d73cda77f7507641f8b5db3c6ef1bc74 /lib | |
| parent | d6951f72ace6be1d89803793d8882107f977f557 (diff) | |
| download | bitbake-75875baa5b4074c49bbef0042d07dbe69f75d79e.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.
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/cooker.py | 3 | ||||
| -rw-r--r-- | lib/bb/parse/parse_py/ConfHandler.py | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 721fa8e37..32b64ea9e 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -541,6 +541,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/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py index f4f85de24..ef120c830 100644 --- a/lib/bb/parse/parse_py/ConfHandler.py +++ b/lib/bb/parse/parse_py/ConfHandler.py @@ -36,10 +36,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.fatal("The BBPATH environment variable must be set") + bb.data.setVar('TOPDIR', os.getcwd(), data) def supports(fn, d): |