From: Ed Bartosh Date: Fri, 10 Jul 2015 11:08:26 +0000 (+0300) Subject: wic: Set default set of bitbake variables X-Git-Tag: 2015-10~1292 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=18cc6d2ec4dc289bb0333dddc96df5a645ea53d0;p=openembedded-core.git wic: Set default set of bitbake variables Set default set of bitbake variables to the set of variables for the first parsed image. This allows wic to find proper bitbake varibale values if it's called with '-e ' even without specifying image in the call of get_bitbake_var. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py index 2f9f515cf8..49787456b2 100644 --- a/scripts/lib/wic/utils/oe/misc.py +++ b/scripts/lib/wic/utils/oe/misc.py @@ -146,6 +146,11 @@ def get_bitbake_var(var, image=None): if key.replace('_', '').isalnum(): _BITBAKE_VARS[image][key] = val.strip('"') + # Make first image a default set of variables + images = [key for key in _BITBAKE_VARS if key] + if len(images) == 1: + _BITBAKE_VARS[None] = _BITBAKE_VARS[image] + return _BITBAKE_VARS[image].get(var) def parse_sourceparams(sourceparams):