diff options
| -rw-r--r-- | meta/classes/populate_sdk_rpm.bbclass | 15 | ||||
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 1 |
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 } python () { + # The following code should be kept in sync w/ the rootfs_rpm version. ml_package_archs = "" + ml_prefix_list = "" multilibs = d.getVar('MULTILIBS', True) or "" for ext in multilibs.split(): eext = ext.split(':') if len(eext) > 1 and eext[0] == 'multilib': localdata = bb.data.createCopy(d) - overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + eext[1] - localdata.setVar("OVERRIDES", overrides) - # TEMP: OVERRIDES isn't working right - localdata.setVar("DEFAULTTUNE", localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) or "") - ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" + default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) + if default_tune: + localdata.setVar("DEFAULTTUNE", default_tune) + package_archs = localdata.getVar("PACKAGE_ARCHS", True) or "" + package_archs = " ".join([i in "all noarch any".split() and i or eext[1]+"_"+i for i in package_archs.split()]) + ml_package_archs += " " + package_archs + ml_prefix_list += " " + eext[1] #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) d.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs) + d.setVar('MULTILIB_PREFIX_LIST', ml_prefix_list) } 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 () { d.setVar('RPM_PREPROCESS_COMMANDS', '') d.setVar('RPM_POSTPROCESS_COMMANDS', '') + # The following code should be kept in sync w/ the populate_sdk_rpm version. ml_package_archs = "" ml_prefix_list = "" multilibs = d.getVar('MULTILIBS', True) or "" |