summaryrefslogtreecommitdiffstats
path: root/meta
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:41:45 +0100
commitf40b763c691559511ed083b77b04f8bc5da95d55 (patch)
tree8926c298a4e44f46a5ecb33d1463584eeb17e442 /meta
parent0f7bf53faaae46d16c9c49cc68645557a5504570 (diff)
downloadpoky-f40b763c691559511ed083b77b04f8bc5da95d55.tar.gz
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 <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/multilib.bbclass5
-rw-r--r--meta/classes/package_rpm.bbclass10
-rw-r--r--meta/classes/rootfs_rpm.bbclass2
3 files changed, 9 insertions, 8 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 6c0dd37930..1aed2a9f97 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -92,9 +92,4 @@ python __anonymous () {
92 multilib_map_variable("PACKAGES_DYNAMIC", variant, d) 92 multilib_map_variable("PACKAGES_DYNAMIC", variant, d)
93 multilib_map_variable("PACKAGE_INSTALL", variant, d) 93 multilib_map_variable("PACKAGE_INSTALL", variant, d)
94 multilib_map_variable("INITSCRIPT_PACKAGES", variant, d) 94 multilib_map_variable("INITSCRIPT_PACKAGES", variant, d)
95
96 package_arch = d.getVar("PACKAGE_ARCH", True)
97 machine_arch = d.getVar("MACHINE_ARCH", True)
98 if package_arch == machine_arch:
99 d.setVar("PACKAGE_ARCH", variant + "_" + package_arch)
100} 95}
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 () {
904 rpmbuild = bb.data.getVar('RPMBUILD', d, True) 904 rpmbuild = bb.data.getVar('RPMBUILD', d, True)
905 targetsys = bb.data.getVar('TARGET_SYS', d, True) 905 targetsys = bb.data.getVar('TARGET_SYS', d, True)
906 targetvendor = bb.data.getVar('TARGET_VENDOR', d, True) 906 targetvendor = bb.data.getVar('TARGET_VENDOR', d, True)
907 pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH}', d) 907 package_arch = bb.data.getVar('PACKAGE_ARCH', d, True) or ""
908 pkgarch = bb.data.expand('${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}', d) 908 if package_arch not in "all any noarch".split():
909 ml_prefix = (bb.data.getVar('MLPREFIX', d, True) or "").replace("-", "_")
910 bb.data.setVar('PACKAGE_ARCH_EXTEND', ml_prefix + package_arch, d)
911 else:
912 bb.data.setVar('PACKAGE_ARCH_EXTEND', package_arch, d)
913 pkgwritedir = bb.data.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}', d)
914 pkgarch = bb.data.expand('${PACKAGE_ARCH_EXTEND}${TARGET_VENDOR}-${TARGET_OS}', d)
909 magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d) 915 magicfile = bb.data.expand('${STAGING_DIR_NATIVE}/usr/share/misc/magic.mgc', d)
910 bb.mkdirhier(pkgwritedir) 916 bb.mkdirhier(pkgwritedir)
911 os.chmod(pkgwritedir, 0755) 917 os.chmod(pkgwritedir, 0755)
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 5ac6bcadfe..dd370b263a 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -220,8 +220,8 @@ python () {
220 default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) 220 default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False)
221 if default_tune: 221 if default_tune:
222 localdata.setVar("DEFAULTTUNE", default_tune) 222 localdata.setVar("DEFAULTTUNE", default_tune)
223 localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False))
224 package_archs = localdata.getVar("PACKAGE_ARCHS", True) or "" 223 package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
224 package_archs = " ".join([i in "all noarch any".split() and i or eext[1]+"_"+i for i in package_archs.split()])
225 ml_package_archs += " " + package_archs 225 ml_package_archs += " " + package_archs
226 ml_prefix_list += " " + eext[1] 226 ml_prefix_list += " " + eext[1]
227 #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) 227 #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))