From f40b763c691559511ed083b77b04f8bc5da95d55 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 28 Sep 2011 19:44:28 +0800 Subject: multilib: add MLPREFIX to deploy folder Add MLPREFIX to multilib deploy forlder to avoid the confliction between multilib and normal package deploy directory. (From OE-Core rev: 18b8d1f7769b63725c3b6883298a841806cd06ab) Signed-off-by: Dongxiao Xu Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'meta/classes/package_rpm.bbclass') diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index d327841250..fa0d8c3457 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) -- cgit v1.2.3-54-g00ecf