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 <image>' even without specifying
image in the call of get_bitbake_var.

(From OE-Core rev: 18cc6d2ec4dc289bb0333dddc96df5a645ea53d0)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2015-07-10 14:08:26 +03:00 committed by Richard Purdie
parent b80ddb0229
commit 8f8d3362b8
1 changed files with 5 additions and 0 deletions

View File

@ -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):