From 73a12b91847fc70c36da3fd57485e9f3529efe90 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 19 Feb 2010 16:26:33 -0700 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/lib/bb/parse/parse_py/ConfHandler.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index deafd6479..a1eaf317a 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): -- cgit v1.2.3