aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-24 22:10:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-25 15:33:32 +0100
commit5aea553e6eaa3b9647f26944976d2a9da79cba42 (patch)
treede3db4f0f77054ceccd5846c50ec12bad4ba48bd
parent4544b7f1d0abd1b1efd74da430f1ddedf3fdbd1d (diff)
downloadopenembedded-core-contrib-5aea553e6eaa3b9647f26944976d2a9da79cba42.tar.gz
openembedded-core-contrib-5aea553e6eaa3b9647f26944976d2a9da79cba42.tar.bz2
openembedded-core-contrib-5aea553e6eaa3b9647f26944976d2a9da79cba42.zip
lib/oe/classextend: Avoid early expansion of PR values
Variables like RDEPENDS can contain EXTENDPKGV which in turn uses AUTOPR based values. This gets set during do_package execution so we want to defer expansion until then. The only way we can do this in the RDEPENDS (and friends) mapping code is to subsitute a dummy value, then change it back again. Horrible but I can't see any other way. This resolves multilib build failures with inconsistent PR values. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/classextend.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/lib/oe/classextend.py b/meta/lib/oe/classextend.py
index 71c7759e914..68efca32d06 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -60,17 +60,22 @@ class ClassExtender(object):
return self.extend_name(dep)
def map_depends_variable(self, varname, suffix = ""):
+ # We need to preserve EXTENDPKGV so it can be expanded correctly later
if suffix:
varname = varname + "_" + suffix
+ orig = self.d.getVar("EXTENDPKGV", False)
+ self.d.setVar("EXTENDPKGV", "EXTENDPKGV")
deps = self.d.getVar(varname, True)
if not deps:
+ self.d.setVar("EXTENDPKGV", orig)
return
deps = bb.utils.explode_dep_versions2(deps)
newdeps = {}
for dep in deps:
newdeps[self.map_depends(dep)] = deps[dep]
- self.d.setVar(varname, bb.utils.join_deps(newdeps, False))
+ self.d.setVar(varname, bb.utils.join_deps(newdeps, False).replace("EXTENDPKGV", "${EXTENDPKGV}"))
+ self.d.setVar("EXTENDPKGV", orig)
def map_packagevars(self):
for pkg in (self.d.getVar("PACKAGES", True).split() + [""]):