summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib.bbclass
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-11-08 14:19:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-08 14:32:55 +0000
commit1ef442561d9784209f56e8c283824c1f2de3e2d1 (patch)
treef6e5185244cd4f3159513973ebfcc910028e639a /meta/classes/multilib.bbclass
parentf9735f3bac60459f2e92ec088cd529d414db9c14 (diff)
downloadpoky-1ef442561d9784209f56e8c283824c1f2de3e2d1.tar.gz
multilib: Drop MULTILIB_IMAGE_INSTALL
There should just be a single IMAGE_INSTALL variable. If the package backends need this split into different multilib components they should be responsible for doing this, not the user. This commit removes the MULTILIB_IMAGE_INSTALL variable. [YOCTO #1564] (From OE-Core rev: 7736862a74c92fe1afe42e170822be13117575c2) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib.bbclass')
-rw-r--r--meta/classes/multilib.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 1aed2a9f97..6eb3bc3756 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -56,9 +56,8 @@ python __anonymous () {
56 map_dependencies("PACKAGE_INSTALL", d) 56 map_dependencies("PACKAGE_INSTALL", d)
57 map_dependencies("LINGUAS_INSTALL", d) 57 map_dependencies("LINGUAS_INSTALL", d)
58 map_dependencies("RDEPENDS", d) 58 map_dependencies("RDEPENDS", d)
59 pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True) + " " + d.getVar("MULTILIB_PACKAGE_INSTALL", False) 59 pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True)
60 d.setVar("MULTILIB_PACKAGE_INSTALL", pinstall) 60 d.setVar("PACKAGE_INSTALL", pinstall)
61 d.setVar("PACKAGE_INSTALL", "")
62 d.setVar("LINGUAS_INSTALL", "") 61 d.setVar("LINGUAS_INSTALL", "")
63 # FIXME, we need to map this to something, not delete it! 62 # FIXME, we need to map this to something, not delete it!
64 d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "") 63 d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")