From 015f117d851ef3a102ebafc5e4102a57d2ca620f Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Mon, 4 Jun 2012 14:00:19 -0700 Subject: yocto-kernel: use BUILDDIR to find bblayers.conf The current code assumes that builddir == srcdir/build, which it obviously isn't sometimes. Use BUILDDIR to get the actual builddir being used. Fixes [YOCTO #2219]. Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/bsp/kernel.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py index 360851b205..8b3aa72c9c 100644 --- a/scripts/lib/bsp/kernel.py +++ b/scripts/lib/bsp/kernel.py @@ -37,7 +37,12 @@ def find_bblayers(scripts_path): """ Find and return a sanitized list of the layers found in BBLAYERS. """ - bblayers_conf = os.path.join(scripts_path, "../build/conf/bblayers.conf") + try: + builddir = os.environ["BUILDDIR"] + except KeyError: + print "BUILDDIR not found, exiting. (Did you forget to source oe-init-build-env?)" + sys.exit(1) + bblayers_conf = os.path.join(builddir, "conf/bblayers.conf") layers = [] -- cgit v1.2.3-54-g00ecf