diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-17 10:08:53 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-05 12:36:28 +0000 |
commit | 0fa52f70789afe5a53384ba20249af34c16a8568 (patch) | |
tree | 10922171df8f0e469961b727a9f1ebb2830cd719 /meta/classes/native.bbclass | |
parent | 5aabdbaff7b8be319a86c5e33cc2eb8c2e4aa2ef (diff) | |
download | poky-0fa52f70789afe5a53384ba20249af34c16a8568.tar.gz |
native.bbclass: Fix variable remapping coverage
When looking for RDEPENDS to process, bitbake iterates through PACKAGES
*and* PN. Since native.bbclass sets PACKAGES to be empty, its pointless
remapping the list of PACKAGES since this does nothing. There is a problem
since *_${PN} are used by bitbake but not remapped by the native.bbclass
class extension code.
This changes the code to remap _${PN} in both expanded and unexpanded
forms. As a result of this, various surprising dependencies are uncovered
and the patch rectifies those. These are real bugs since they're injecting
unneeded (unremapped) dependencies into the dependency chain.
(From OE-Core rev: 0f485bfd6fc82a109b9da629e464fca1e90faec3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/native.bbclass')
-rw-r--r-- | meta/classes/native.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 49823d6fc6..00196baba8 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass | |||
@@ -127,7 +127,7 @@ python native_virtclass_handler () { | |||
127 | d.setVar(varname, " ".join(newdeps)) | 127 | d.setVar(varname, " ".join(newdeps)) |
128 | 128 | ||
129 | map_dependencies("DEPENDS", e.data) | 129 | map_dependencies("DEPENDS", e.data) |
130 | for pkg in (e.data.getVar("PACKAGES", True).split() + [""]): | 130 | for pkg in [e.data.getVar("PN", True), "", "${PN}"]: |
131 | map_dependencies("RDEPENDS", e.data, pkg) | 131 | map_dependencies("RDEPENDS", e.data, pkg) |
132 | map_dependencies("RRECOMMENDS", e.data, pkg) | 132 | map_dependencies("RRECOMMENDS", e.data, pkg) |
133 | map_dependencies("RSUGGESTS", e.data, pkg) | 133 | map_dependencies("RSUGGESTS", e.data, pkg) |