summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-02-19 16:26:33 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-03-22 14:56:00 +0000
commit73a12b91847fc70c36da3fd57485e9f3529efe90 (patch)
tree07301fcf9980ca2164e888198c4138c25b8e92cb
parent9998b454bba5efac11b70b1ca256cb113d8f0807 (diff)
downloadpoky-73a12b91847fc70c36da3fd57485e9f3529efe90.tar.gz
Error early if BBPATH is unset, rather than falling back to share/bitbake
Better to error as early as possible rather than experience strange behavior resulting from the use of the largely useless stock bitbake.conf/base.bbclass. (Bitbake rev: 641e6cf3ec3ab4d26929cf4d2a3704ff07eed4d6) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/parse/parse_py/ConfHandler.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index deafd6479f..a1eaf317ac 100644
--- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
@@ -39,11 +39,7 @@ def init(data):
39 topdir = os.getcwd() 39 topdir = os.getcwd()
40 bb.data.setVar('TOPDIR', topdir, data) 40 bb.data.setVar('TOPDIR', topdir, data)
41 if not bb.data.getVar('BBPATH', data): 41 if not bb.data.getVar('BBPATH', data):
42 from pkg_resources import Requirement, resource_filename 42 bb.fatal("The BBPATH environment variable must be set")
43 bitbake = Requirement.parse("bitbake")
44 datadir = resource_filename(bitbake, "../share/bitbake")
45 basedir = resource_filename(bitbake, "..")
46 bb.data.setVar('BBPATH', '%s:%s:%s' % (topdir, datadir, basedir), data)
47 43
48 44
49def supports(fn, d): 45def supports(fn, d):