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.
Signed-off-by: Ed Bartosh <ed.bart...@linux.intel.com>
---
scripts/lib/wic/utils/oe/misc.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py
index 2f9f515..4978745 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):
--
2.1.4
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
