summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_rpm.bbclass
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-07-06 14:13:59 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-09 11:38:02 +0100
commit54a18cc1e7a2d39d60c52d81f5f30a6e573da509 (patch)
tree34d7b25011dd699f66a1e4f9fb707b4c8503b116 /meta/classes/populate_sdk_rpm.bbclass
parent0e832baadf78d5c6caa4a3b41d49430971b9bacb (diff)
downloadpoky-54a18cc1e7a2d39d60c52d81f5f30a6e573da509.tar.gz
populate_sdk_rpm: Sync multilib configuration with rootfs_rpm
An anonymous python chunk configures some multilib settings for both populate_sdk_rpm and rootfs_rpm. The two classes should contain identical versions to ensure that the generated multilib configuration is the same for the SDK and the rootfs. (From OE-Core rev: 0f60722ef460fa826e4f02e7457004e64ca41d76) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_rpm.bbclass')
-rw-r--r--meta/classes/populate_sdk_rpm.bbclass15
1 files changed, 10 insertions, 5 deletions
diff --git a/meta/classes/populate_sdk_rpm.bbclass b/meta/classes/populate_sdk_rpm.bbclass
index b115c278ee..365a337a05 100644
--- a/meta/classes/populate_sdk_rpm.bbclass
+++ b/meta/classes/populate_sdk_rpm.bbclass
@@ -115,18 +115,23 @@ EOF
115} 115}
116 116
117python () { 117python () {
118 # The following code should be kept in sync w/ the rootfs_rpm version.
118 ml_package_archs = "" 119 ml_package_archs = ""
120 ml_prefix_list = ""
119 multilibs = d.getVar('MULTILIBS', True) or "" 121 multilibs = d.getVar('MULTILIBS', True) or ""
120 for ext in multilibs.split(): 122 for ext in multilibs.split():
121 eext = ext.split(':') 123 eext = ext.split(':')
122 if len(eext) > 1 and eext[0] == 'multilib': 124 if len(eext) > 1 and eext[0] == 'multilib':
123 localdata = bb.data.createCopy(d) 125 localdata = bb.data.createCopy(d)
124 overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + eext[1] 126 default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False)
125 localdata.setVar("OVERRIDES", overrides) 127 if default_tune:
126 # TEMP: OVERRIDES isn't working right 128 localdata.setVar("DEFAULTTUNE", default_tune)
127 localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "") 129 package_archs = localdata.getVar("PACKAGE_ARCHS", True) or ""
128 ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" 130 package_archs = " ".join([i in "all noarch any".split() and i or eext[1]+"_"+i for i in package_archs.split()])
131 ml_package_archs += " " + package_archs
132 ml_prefix_list += " " + eext[1]
129 #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) 133 #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides))
130 d.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs) 134 d.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs)
135 d.setVar('MULTILIB_PREFIX_LIST', ml_prefix_list)
131} 136}
132 137