mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-07-17 04:07:06 +00:00
Code Issues Projects Releases Wiki Activity

multilib: add MLPREFIX to deploy folder

Browse Source 
Add MLPREFIX to multilib deploy forlder to avoid the confliction between
multilib and normal package deploy directory.

(From OE-Core rev: b5e8cad5a782015f2216325203847c287c778cac)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dongxiao Xu
2011-09-28 19:44:28 +08:00
committed by Richard Purdie
parent 909dd5b306
commit 317fc4fbd0
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/package_rpm.bbclass
+8 -2
View File
@@ -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)