summaryrefslogtreecommitdiff
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:45 +0000
commit7736862a74c92fe1afe42e170822be13117575c2 (patch)
treecc41e1e2adbff0fecb70e786cde9d9d52132abb7 /meta/classes/multilib.bbclass
parent1f4028337d5e288e239f44ef34e1d707b785273e (diff)
downloadopenembedded-core-7736862a74c92fe1afe42e170822be13117575c2.tar.gz
openembedded-core-7736862a74c92fe1afe42e170822be13117575c2.tar.bz2
openembedded-core-7736862a74c92fe1afe42e170822be13117575c2.tar.xz
openembedded-core-7736862a74c92fe1afe42e170822be13117575c2.zip
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] 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 1aed2a9f9..6eb3bc375 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -56,9 +56,8 @@ python __anonymous () {
map_dependencies("PACKAGE_INSTALL", d)
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", "")
+ pinstall = d.getVar("LINGUAS_INSTALL", True) + " " + d.getVar("PACKAGE_INSTALL", True)
+ d.setVar("PACKAGE_INSTALL", pinstall)
d.setVar("LINGUAS_INSTALL", "")
# FIXME, we need to map this to something, not delete it!
d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")