mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-14 20:53:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

wic: misc.py: add parameter 'cache' to get_bitbake_vars

Browse Source 
This parameter will be used to allow or prevent variable caching.

For example, we don't want to cache value of RECIPE_SYSROOT_NATIVE
wic-tools variable as we may decide to rebuild wic-tools.

(From OE-Core rev: e4269fdb4c3ef06b97df063f8586f74986215c83)

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
2017-01-19 16:18:28 +02:00
committed by Richard Purdie
parent 253b8d7d58
commit 7d5f44b455
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/lib/wic/utils/oe/misc.py
View File

@@ -160,7 +160,7 @@ class BitbakeVars(defaultdict):
key, val = match.groups()
self[image][key] = val.strip('"')
def get_var(self, var, image=None):
def get_var(self, var, image=None, cache=True):
"""
Get bitbake variable from 'bitbake -e' output or from .env file.
This is a lazy method, i.e. it runs bitbake or parses file only when
@@ -202,21 +202,26 @@ class BitbakeVars(defaultdict):
self._parse_line(line, image)
# Make first image a default set of variables
images = [key for key in self if key]
if len(images) == 1:
self[None] = self[image]
if cache:
images = [key for key in self if key]
if len(images) == 1:
self[None] = self[image]
return self[image].get(var)
result = self[image].get(var)
if not cache:
self.pop(image, None)
return result
# Create BB_VARS singleton
BB_VARS = BitbakeVars()
def get_bitbake_var(var, image=None):
def get_bitbake_var(var, image=None, cache=True):
"""
Provide old get_bitbake_var API by wrapping
get_var method of BB_VARS singleton.
"""
return BB_VARS.get_var(var, image)
return BB_VARS.get_var(var, image, cache)
def parse_sourceparams(sourceparams):
"""