diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/multilib.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/rootfs_rpm.bbclass | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 583d76b0f3..138dd27a6e 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -76,4 +76,9 @@ python __anonymous () { multilib_map_variable("PACKAGES_DYNAMIC", variant, d) multilib_map_variable("PACKAGE_INSTALL", variant, d) multilib_map_variable("INITSCRIPT_PACKAGES", variant, d) + + package_arch = d.getVar("PACKAGE_ARCH", True) + machine_arch = d.getVar("MACHINE_ARCH", True) + if package_arch == machine_arch: + d.setVar("PACKAGE_ARCH", variant + "_" + package_arch) } diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass index 135ca75fa5..7936d77b96 100644 --- a/meta/classes/rootfs_rpm.bbclass +++ b/meta/classes/rootfs_rpm.bbclass @@ -218,7 +218,9 @@ python () { default_tune = localdata.getVar("DEFAULTTUNE_virtclass-multilib-" + eext[1], False) if default_tune: localdata.setVar("DEFAULTTUNE", default_tune) - ml_package_archs += localdata.getVar("PACKAGE_ARCHS", True) or "" + localdata.setVar("MACHINE_ARCH", eext[1] + "_" + localdata.getVar("MACHINE_ARCH", False)) + package_archs = localdata.getVar("PACKAGE_ARCHS", True) or "" + ml_package_archs += " " + package_archs #bb.note("ML_PACKAGE_ARCHS %s %s %s" % (eext[1], localdata.getVar("PACKAGE_ARCHS", True) or "(none)", overrides)) bb.data.setVar('MULTILIB_PACKAGE_ARCHS', ml_package_archs, d) } |