summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-04-30 14:12:14 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-06 10:00:31 +0100
commitc0d92e51a1603e31eb31c5c6201e3ecbef81bd61 (patch)
tree973f22a15e0ef93ff1378449893f487bfe247205 /scripts
parentdb89f1826bd8e2e8329d2e9af444aff181d44fe7 (diff)
downloadpoky-c0d92e51a1603e31eb31c5c6201e3ecbef81bd61.tar.gz
poky-c0d92e51a1603e31eb31c5c6201e3ecbef81bd61.tar.bz2
poky-c0d92e51a1603e31eb31c5c6201e3ecbef81bd61.zip
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/kernel.py7
1 files changed, 6 insertions, 1 deletions
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 = []