diff options
| -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 5a868c92a..eae76f8d0 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 9188119e4..9128a2ef8 100644 --- a/lib/bb/parse/parse_py/ConfHandler.py +++ b/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): |