diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-21 12:16:03 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-21 12:20:35 +0100 |
| commit | e9bfd0583d7796cb9f71ff8762650e057103e3d2 (patch) | |
| tree | 0c2bcb639009f1bbc129b75438b6f3faf16ff499 /meta | |
| parent | 8d3938782cce8461f9e5d5e7aeed858232bb0cc0 (diff) | |
| download | openembedded-core-e9bfd0583d7796cb9f71ff8762650e057103e3d2.tar.gz openembedded-core-e9bfd0583d7796cb9f71ff8762650e057103e3d2.tar.bz2 openembedded-core-e9bfd0583d7796cb9f71ff8762650e057103e3d2.zip | |
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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/native.bbclass | 4 |
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 () { newdeps.append(dep) d.setVar(varname, " ".join(newdeps)) + e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native") + map_dependencies("DEPENDS", e.data) for pkg in [e.data.getVar("PN", True), "", "${PN}"]: map_dependencies("RDEPENDS", e.data, pkg) @@ -161,7 +163,7 @@ python native_virtclass_handler () { nprovides.append(prov) e.data.setVar("PROVIDES", ' '.join(nprovides)) - e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native") + } addhandler native_virtclass_handler |