From 38d0b3744b5829333148ac4fc97dc45a8d0ba3a5 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Sun, 30 Aug 2015 20:47:02 +0300 Subject: wic: add default_image attribute to BitbakeVars New attribute is used when bitbake variable is requested without specifying image name. The attribute should be set from outside, for example when wic is called with '-e ' option. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/utils/oe/misc.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py index 41e435fc27..040176d486 100644 --- a/scripts/lib/wic/utils/oe/misc.py +++ b/scripts/lib/wic/utils/oe/misc.py @@ -131,6 +131,9 @@ class BitbakeVars(defaultdict): def __init__(self): defaultdict.__init__(self, dict) + # default_image attribute should be set from outside + self.default_image = None + def _parse_line(self, line, image): """ Parse one line from bitbake -e output. @@ -152,6 +155,9 @@ class BitbakeVars(defaultdict): Get bitbake variable value lazy way, i.e. run 'bitbake -e' only when variable is requested. """ + if not image: + image = self.default_image + if image not in self: # Get bitbake -e output cmd = "bitbake -e" -- cgit v1.2.3