diff options
-rw-r--r-- | meta/lib/oe/classextend.py | 7 |
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() + [""]): |