summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-21 12:16:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-21 23:37:21 +0100
commitb68de1cdc5d25c9f1b52d1c473c0d50856c6a346 (patch)
treea7c8b57b0f0b20145ed2d3918078472ef699bc5e /meta
parentf8a6931be576db7de8ed0c245dfd057eef13e03e (diff)
downloadpoky-b68de1cdc5d25c9f1b52d1c473c0d50856c6a346.tar.gz
native: Move virtclass override to earlier so DEPENDS is handled correctly
Currently the virtclass override is added too late to be taken into account when DEPENDS and other variables are processed by the virtclass extension code. This sets the overrides in a more optimal place, meaning they are accounted for in variables like DEPENDS. Recipes in meta-oe like libwmf-native showed the issue. (From OE-Core rev: e9bfd0583d7796cb9f71ff8762650e057103e3d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 71b05720f2..bcbcd61e03 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -142,6 +142,8 @@ python native_virtclass_handler () {
142 newdeps.append(dep) 142 newdeps.append(dep)
143 d.setVar(varname, " ".join(newdeps)) 143 d.setVar(varname, " ".join(newdeps))
144 144
145 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native")
146
145 map_dependencies("DEPENDS", e.data) 147 map_dependencies("DEPENDS", e.data)
146 for pkg in [e.data.getVar("PN", True), "", "${PN}"]: 148 for pkg in [e.data.getVar("PN", True), "", "${PN}"]:
147 map_dependencies("RDEPENDS", e.data, pkg) 149 map_dependencies("RDEPENDS", e.data, pkg)
@@ -161,7 +163,7 @@ python native_virtclass_handler () {
161 nprovides.append(prov) 163 nprovides.append(prov)
162 e.data.setVar("PROVIDES", ' '.join(nprovides)) 164 e.data.setVar("PROVIDES", ' '.join(nprovides))
163 165
164 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native") 166
165} 167}
166 168
167addhandler native_virtclass_handler 169addhandler native_virtclass_handler