From: Tom Zanussi <tom.zanussi@intel.com>
Date: Mon, 30 Apr 2012 19:12:14 +0000 (-0500)
Subject: yocto-kernel: use BUILDDIR to find bblayers.conf
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4a9d139ea4f2f12da7e784066f2aa9357b37e30;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py
index 360851b205f..8b3aa72c9c2 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 = []