diff options
| author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-09-27 15:28:02 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-28 11:47:23 +0100 |
| commit | 93984bb1c9440294a694986831d7a4114c55a282 (patch) | |
| tree | 3fb2cb5a46e8465687c16c6da69625d322972a69 /meta/classes/multilib.bbclass | |
| parent | c91fb898039ac5ee0101fd652704d32ea9a5e75d (diff) | |
| download | openembedded-core-93984bb1c9440294a694986831d7a4114c55a282.tar.gz openembedded-core-93984bb1c9440294a694986831d7a4114c55a282.tar.bz2 openembedded-core-93984bb1c9440294a694986831d7a4114c55a282.zip | |
multilib.bbclass: map RDEPENDS and LINGUAS_INSTALL for image recipes
RDEPENDS of image type recipe needs to be mapped to make sure that the
packages included in the image should be multilib version.
Also add LINGUAS_INSTALL into MULTILIB_PACKAGE_INSTALL list.
[YOCTO #1496]
[YOCTO #1527]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/classes/multilib.bbclass')
| -rw-r--r-- | meta/classes/multilib.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 98f69116b8..0ea1038de9 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -54,9 +54,12 @@ python __anonymous () { if bb.data.inherits_class('image', d): map_dependencies("PACKAGE_INSTALL", d) - pinstall = d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False) + map_dependencies("LINGUAS_INSTALL", d) + map_dependencies("RDEPENDS", d) + pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False) d.setVar("MULTILIB_PACKAGE_INSTALL", pinstall) d.setVar("PACKAGE_INSTALL", "") + d.setVar("LINGUAS_INSTALL", "") # FIXME, we need to map this to something, not delete it! d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "") return |