summaryrefslogtreecommitdiff
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-09-28 19:44:28 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-28 21:40:03 +0100
commit18b8d1f7769b63725c3b6883298a841806cd06ab (patch)
treef80b8f7235c5a18cabcb3d44ba65be869084b12e /meta/classes/package_rpm.bbclass
parent0762e1ff5e29487f5b25a069e31257275415a3e6 (diff)
downloadopenembedded-core-18b8d1f7769b63725c3b6883298a841806cd06ab.tar.gz
openembedded-core-18b8d1f7769b63725c3b6883298a841806cd06ab.tar.bz2
openembedded-core-18b8d1f7769b63725c3b6883298a841806cd06ab.tar.xz
openembedded-core-18b8d1f7769b63725c3b6883298a841806cd06ab.zip
multilib: add MLPREFIX to deploy folder
Add MLPREFIX to multilib deploy forlder to avoid the confliction between multilib and normal package deploy directory. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index d32784125..fa0d8c345 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -904,8 +904,14 @@ python do_package_rpm () {
rpmbuild = bb.data.getVar('RPMBUILD', d, True)
targetsys = bb.data.getVar('TARGET_SYS', d, True)
targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
- pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d)
- pkgarch = bb.data.expand('${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d)
+ package_arch = bb.data.getVar('PACKAGE_ARCH', d, True) or ""
+ if package_arch not in "all any noarch".split():
+ ml_prefix = (bb.data.getVar('MLPREFIX', d, True) or "").replace("-", "_")
+ bb.data.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch, d)
+ else:
+ bb.data.setVar('PACKAGE_ARCH_EXTEND', package_arch, d)
+ pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d)
+ pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d)
magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
bb.mkdirhier(pkgwritedir)
os.chmod(pkgwritedir, 0755)