[yocto] [PATCH 1/2] yocto-kernel: use BUILDDIR to find bblayers.conf

[Darren Hart]

On 04/27/2012 12:00 PM, tom.zanussi at intel.com wrote:
> From: Tom Zanussi <tom.zanussi at intel.com>
> 
> 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 at intel.com>
> ---
>  scripts/lib/bsp/kernel.py |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 
> diff --git a/scripts/lib/bsp/kernel.py b/scripts/lib/bsp/kernel.py
> index 360851b..8b3aa72 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?)"

We should probably update the bsp tools to use the logging module, I'll
open a feature request for that.

https://bugzilla.yoctoproject.org/show_bug.cgi?id=2375

This should make it easier to instrument the code with verbosity levels
as well as make these go to the right file descriptor. I believe this is
consistent with the rest of the source though, so this looks fine as is.


> +        sys.exit(1)
> +    bblayers_conf = os.path.join(builddir, "conf/bblayers.conf")
>  
>      layers = []
>  

Acked-by: Darren Hart <dvhart at linux.intel.com>

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel