summaryrefslogtreecommitdiff
path: root/meta/classes/multilib.bbclass
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-08 21:35:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-21 13:32:33 +0100
commit921f984aa65e23d5a8ec5c2e58a96cb8a4790b5d (patch)
tree090a438f0482f357ae4a83651283032b21432037 /meta/classes/multilib.bbclass
parenta3909a6a42a1e3e80b7f2597f95ecb7db2814d2d (diff)
downloadopenembedded-core-921f984aa65e23d5a8ec5c2e58a96cb8a4790b5d.tar.gz
openembedded-core-921f984aa65e23d5a8ec5c2e58a96cb8a4790b5d.tar.bz2
openembedded-core-921f984aa65e23d5a8ec5c2e58a96cb8a4790b5d.tar.xz
openembedded-core-921f984aa65e23d5a8ec5c2e58a96cb8a4790b5d.zip
rpm: add multilib prefix for archs under deploy/rpm
Currently MACHINE_ARCH deploy folder is unique in multilib system, thus a lib32 version of rpm package will override a normal rpm package if its PACKAGE_ARCH is ${MACHINE_ARCH}. Define different deploy folder for multilib architectures to avoid the confliction. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/classes/multilib.bbclass')
-rw-r--r--meta/classes/multilib.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 583d76b0f..138dd27a6 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -76,4 +76,9 @@ python __anonymous () {
multilib_map_variable("PACKAGES_DYNAMIC", variant, d)
multilib_map_variable("PACKAGE_INSTALL", variant, d)
multilib_map_variable("INITSCRIPT_PACKAGES", variant, d)
+
+ package_arch = d.getVar("PACKAGE_ARCH", True)
+ machine_arch = d.getVar("MACHINE_ARCH", True)
+ if package_arch == machine_arch:
+ d.setVar("PACKAGE_ARCH", variant + "_" + package_arch)
}