summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-02-19 16:26:33 -0700
committerChris Larson <chris_larson@mentor.com>2010-02-19 16:26:34 -0700
commit641e6cf3ec3ab4d26929cf4d2a3704ff07eed4d6 (patch)
tree0b6755ec3b8b0a590a1a9dfe2e1b4de4af98e020
parent989af2c20c5bb151a8d968696b7f6e48145b1b6b (diff)
downloadbitbake-641e6cf3ec3ab4d26929cf4d2a3704ff07eed4d6.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. Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--lib/bb/parse/parse_py/ConfHandler.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/bb/parse/parse_py/ConfHandler.py b/lib/bb/parse/parse_py/ConfHandler.py
index deafd6479..a1eaf317a 100644
--- a/lib/bb/parse/parse_py/ConfHandler.py
+++ b/lib/bb/parse/parse_py/ConfHandler.py
@@ -39,11 +39,7 @@ def init(data):
topdir = os.getcwd()
bb.data.setVar('TOPDIR', topdir, data)
if not bb.data.getVar('BBPATH', data):
- from pkg_resources import Requirement, resource_filename
- bitbake = Requirement.parse("bitbake")
- datadir = resource_filename(bitbake, "../share/bitbake")
- basedir = resource_filename(bitbake, "..")
- bb.data.setVar('BBPATH', '%s:%s:%s' % (topdir, datadir, basedir), data)
+ bb.fatal("The BBPATH environment variable must be set")
def supports(fn, d):