summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-27 15:28:02 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-04 13:59:29 +0100
commit7a541d69dd97bc9249eaeeb748dc804c6eae3263 (patch)
tree6e3c1f3d498cf59af69e6e6ae27a524e82b73c9e
parentaa1cb68ce2d7a8a5d1597e96d530a98a174d1b53 (diff)
downloadpoky-7a541d69dd97bc9249eaeeb748dc804c6eae3263.tar.gz
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] (From OE-Core rev: ad52cf921b2e08f2a99f494b229d5b7099b33990) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/multilib.bbclass5
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 () {
54 54
55 if bb.data.inherits_class('image', d): 55 if bb.data.inherits_class('image', d):
56 map_dependencies("PACKAGE_INSTALL", d) 56 map_dependencies("PACKAGE_INSTALL", d)
57 pinstall = d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False) 57 map_dependencies("LINGUAS_INSTALL", d)
58 map_dependencies("RDEPENDS", d)
59 pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False)
58 d.setVar("MULTILIB_PACKAGE_INSTALL", pinstall) 60 d.setVar("MULTILIB_PACKAGE_INSTALL", pinstall)
59 d.setVar("PACKAGE_INSTALL", "") 61 d.setVar("PACKAGE_INSTALL", "")
62 d.setVar("LINGUAS_INSTALL", "")
60 # FIXME, we need to map this to something, not delete it! 63 # FIXME, we need to map this to something, not delete it!
61 d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "") 64 d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")
62 return 65 return