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>

diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py
index deafd6479f53d9fccf013c55876545da3689056b..a1eaf317ac1fc0237bfd75250b340d3eec825ef7 100644 (file)
--- 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):