diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-02-19 16:26:33 -0700 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-22 14:56:00 +0000 |
| commit | 73a12b91847fc70c36da3fd57485e9f3529efe90 (patch) | |
| tree | 07301fcf9980ca2164e888198c4138c25b8e92cb | |
| parent | 9998b454bba5efac11b70b1ca256cb113d8f0807 (diff) | |
| download | openembedded-core-73a12b91847fc70c36da3fd57485e9f3529efe90.tar.gz openembedded-core-73a12b91847fc70c36da3fd57485e9f3529efe90.tar.bz2 openembedded-core-73a12b91847fc70c36da3fd57485e9f3529efe90.zip | |
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.py | 6 |
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): 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): |