]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: add default_image attribute to BitbakeVars
authorEd Bartosh <ed.bartosh@linux.intel.com>
Sun, 30 Aug 2015 17:47:02 +0000 (20:47 +0300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 30 Aug 2015 20:38:11 +0000 (21:38 +0100)
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 <image>' option.

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/wic/utils/oe/misc.py

index 41e435fc27569dbb1d1db141ade6cb0aa926a5b5..040176d486df413326fbe71c9668890d305bc0cb 100644 (file)
@@ -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"