summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/populate_sdk_rpm.bbclass15
-rw-r--r--meta/classes/rootfs_rpm.bbclass1
2 files changed, 11 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
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 202f9ce514..4551f7a608 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -198,6 +198,7 @@ python () {
198 d.setVar('RPM_PREPROCESS_COMMANDS', '') 198 d.setVar('RPM_PREPROCESS_COMMANDS', '')
199 d.setVar('RPM_POSTPROCESS_COMMANDS', '') 199 d.setVar('RPM_POSTPROCESS_COMMANDS', '')
200 200
201 # The following code should be kept in sync w/ the populate_sdk_rpm version.
201 ml_package_archs = "" 202 ml_package_archs = ""
202 ml_prefix_list = "" 203 ml_prefix_list = ""
203 multilibs = d.getVar('MULTILIBS', True) or "" 204 multilibs = d.getVar('MULTILIBS', True) or ""