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>
This commit is contained in:
Chris Larson 2010-04-14 14:27:29 -07:00 committed by Richard Purdie
parent 22a2179905
commit dc39ebe91e
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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):