summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-02-02 11:03:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-03 14:53:55 +0000
commit8ac69a923c0a9733eeef1304df6f9ce4db2a1e6a (patch)
tree4aadfd687a8b3705a970647f63f8616c445b3d7b
parent7330a886ceb897d78ecb389d783858cc284110f4 (diff)
downloadpoky-8ac69a923c0a9733eeef1304df6f9ce4db2a1e6a.tar.gz
native: remove PN from DEPENDS automatically
If a recipe (say, wayland) has DEPENDS=wayland-native and BBCLASSEXTEND=native, when built as wayland-native it has DEPENDS=wayland-native which results in a circular dependency. Typically this is resolved by having explicit DEPENDS_class-native statements but as this is duplication which can lead to inconsistent dependencies, automatically remove the circular dependency. (From OE-Core rev: 3e9392c0965166462e0993d46f4cc2fb1832f1e5) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/native.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 4acc936ccd..5ca5c95b4d 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -132,7 +132,9 @@ python native_virtclass_handler () {
132 deps = bb.utils.explode_deps(deps) 132 deps = bb.utils.explode_deps(deps)
133 newdeps = [] 133 newdeps = []
134 for dep in deps: 134 for dep in deps:
135 if "-cross-" in dep: 135 if dep == pn:
136 continue
137 elif "-cross-" in dep:
136 newdeps.append(dep.replace("-cross", "-native")) 138 newdeps.append(dep.replace("-cross", "-native"))
137 elif not dep.endswith("-native"): 139 elif not dep.endswith("-native"):
138 newdeps.append(dep + "-native") 140 newdeps.append(dep + "-native")