diff options
| -rw-r--r-- | meta/classes-recipe/native.bbclass | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes-recipe/native.bbclass b/meta/classes-recipe/native.bbclass index 1e94585f3e..cfd299d0c8 100644 --- a/meta/classes-recipe/native.bbclass +++ b/meta/classes-recipe/native.bbclass | |||
| @@ -139,7 +139,7 @@ python native_virtclass_handler () { | |||
| 139 | if "native" not in classextend: | 139 | if "native" not in classextend: |
| 140 | return | 140 | return |
| 141 | 141 | ||
| 142 | def map_dependencies(varname, d, suffix = "", selfref=True): | 142 | def map_dependencies(varname, d, suffix = "", selfref=True, regex=False): |
| 143 | if suffix: | 143 | if suffix: |
| 144 | varname = varname + ":" + suffix | 144 | varname = varname + ":" + suffix |
| 145 | deps = d.getVar(varname) | 145 | deps = d.getVar(varname) |
| @@ -148,7 +148,9 @@ python native_virtclass_handler () { | |||
| 148 | deps = bb.utils.explode_deps(deps) | 148 | deps = bb.utils.explode_deps(deps) |
| 149 | newdeps = [] | 149 | newdeps = [] |
| 150 | for dep in deps: | 150 | for dep in deps: |
| 151 | if dep == pn: | 151 | if regex and dep.startswith("^") and dep.endswith("$"): |
| 152 | newdeps.append(dep[:-1].replace(pn, bpn) + "-native$") | ||
| 153 | elif dep == pn: | ||
| 152 | if not selfref: | 154 | if not selfref: |
| 153 | continue | 155 | continue |
| 154 | newdeps.append(dep) | 156 | newdeps.append(dep) |
| @@ -171,6 +173,7 @@ python native_virtclass_handler () { | |||
| 171 | map_dependencies("RPROVIDES", e.data, pkg) | 173 | map_dependencies("RPROVIDES", e.data, pkg) |
| 172 | map_dependencies("RREPLACES", e.data, pkg) | 174 | map_dependencies("RREPLACES", e.data, pkg) |
| 173 | map_dependencies("PACKAGES", e.data) | 175 | map_dependencies("PACKAGES", e.data) |
| 176 | map_dependencies("PACKAGES_DYNAMIC", e.data, regex=True) | ||
| 174 | 177 | ||
| 175 | provides = e.data.getVar("PROVIDES") | 178 | provides = e.data.getVar("PROVIDES") |
| 176 | nprovides = [] | 179 | nprovides = [] |
