From 9184d807f776ca3c9ef315050fb2a9e139fedc8b Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 27 Sep 2011 15:28:02 +0800 Subject: 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: 93984bb1c9440294a694986831d7a4114c55a282) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/classes/multilib.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes/multilib.bbclass') 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 -- cgit v1.2.3-54-g00ecf