[bitbake-devel] [PATCH] cache: Don't try to expand __inherit_data
Richard Purdie
richard.purdie at linuxfoundation.org
Tue Nov 10 09:54:44 UTC 2015
Trying to expand a variable which isn't a string doesn't make sense.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
bitbake/lib/bb/cache.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index ab09b08..521f758 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -85,8 +85,8 @@ class RecipeInfoCommon(object):
return out_dict
@classmethod
- def getvar(cls, var, metadata):
- return metadata.getVar(var, True) or ''
+ def getvar(cls, var, metadata, expand = True):
+ return metadata.getVar(var, expand) or ''
class CoreRecipeInfo(RecipeInfoCommon):
@@ -142,7 +142,7 @@ class CoreRecipeInfo(RecipeInfoCommon):
self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata)
self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata)
self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata)
- self.inherits = self.getvar('__inherit_cache', metadata)
+ self.inherits = self.getvar('__inherit_cache', metadata, expand=False)
self.fakerootenv = self.getvar('FAKEROOTENV', metadata)
self.fakerootdirs = self.getvar('FAKEROOTDIRS', metadata)
self.fakerootnoenv = self.getvar('FAKEROOTNOENV', metadata)
More information about the bitbake-devel
mailing list