mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib/oe/classextend: Avoid early expansion of PR values

Browse Source 
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>
This commit is contained in:
Richard Purdie
2014-07-24 22:10:13 +01:00
parent aee3b5330d
commit 42470aa22d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
meta/lib/oe/classextend.py
View File

@@ -60,17 +60,22 @@ class ClassExtender(object):
return self.extend_name(dep) return self.extend_name(dep)
def map_depends_variable(self, varname, suffix = ""): def map_depends_variable(self, varname, suffix = ""):
# We need to preserve EXTENDPKGV so it can be expanded correctly later
if suffix: if suffix:
varname = varname + "_" + suffix varname = varname + "_" + suffix
orig = self.d.getVar("EXTENDPKGV", False)
self.d.setVar("EXTENDPKGV", "EXTENDPKGV")
deps = self.d.getVar(varname, True) deps = self.d.getVar(varname, True)
if not deps: if not deps:
self.d.setVar("EXTENDPKGV", orig)
return return
deps = bb.utils.explode_dep_versions2(deps) deps = bb.utils.explode_dep_versions2(deps)
newdeps = {} newdeps = {}
for dep in deps: for dep in deps:
newdeps[self.map_depends(dep)] = deps[dep] 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): def map_packagevars(self):
for pkg in (self.d.getVar("PACKAGES", True).split() + [""]): for pkg in (self.d.getVar("PACKAGES", True).split() + [""]):