summaryrefslogtreecommitdiffstats
path: root/meta
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:58 +0100
commit42470aa22d9abdf400771d26ea1fb39bc9c16a0d (patch)
tree01411d662bec8d9115754e089787a159e47e809d /meta
parentaee3b5330d263e224851ed1c5c3562ec04e0a2f7 (diff)
downloadpoky-42470aa22d9abdf400771d26ea1fb39bc9c16a0d.tar.gz
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. (From OE-Core rev: 5aea553e6eaa3b9647f26944976d2a9da79cba42) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 71c7759e91..68efca32d0 100644
--- a/meta/lib/oe/classextend.py
+++ b/meta/lib/oe/classextend.py
@@ -60,17 +60,22 @@ class ClassExtender(object):
60 return self.extend_name(dep) 60 return self.extend_name(dep)
61 61
62 def map_depends_variable(self, varname, suffix = ""): 62 def map_depends_variable(self, varname, suffix = ""):
63 # We need to preserve EXTENDPKGV so it can be expanded correctly later
63 if suffix: 64 if suffix:
64 varname = varname + "_" + suffix 65 varname = varname + "_" + suffix
66 orig = self.d.getVar("EXTENDPKGV", False)
67 self.d.setVar("EXTENDPKGV", "EXTENDPKGV")
65 deps = self.d.getVar(varname, True) 68 deps = self.d.getVar(varname, True)
66 if not deps: 69 if not deps:
70 self.d.setVar("EXTENDPKGV", orig)
67 return 71 return
68 deps = bb.utils.explode_dep_versions2(deps) 72 deps = bb.utils.explode_dep_versions2(deps)
69 newdeps = {} 73 newdeps = {}
70 for dep in deps: 74 for dep in deps:
71 newdeps[self.map_depends(dep)] = deps[dep] 75 newdeps[self.map_depends(dep)] = deps[dep]
72 76
73 self.d.setVar(varname, bb.utils.join_deps(newdeps, False)) 77 self.d.setVar(varname, bb.utils.join_deps(newdeps, False).replace("EXTENDPKGV", "${EXTENDPKGV}"))
78 self.d.setVar("EXTENDPKGV", orig)
74 79
75 def map_packagevars(self): 80 def map_packagevars(self):
76 for pkg in (self.d.getVar("PACKAGES", True).split() + [""]): 81 for pkg in (self.d.getVar("PACKAGES", True).split() + [""]):