diff options
-rw-r--r-- | meta/classes/staging.bbclass | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 412e269bd2..455eb056f0 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -190,8 +190,23 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): pkgarchs = ['${MACHINE_ARCH}'] pkgarchs = pkgarchs + list(reversed(d.getVar("PACKAGE_EXTRA_ARCHS").split())) pkgarchs.append('allarch') + + # Handle multilib archs + variants = d.getVar("MULTILIB_VARIANTS", True) or "" + for variant in variants.split(): + localdata = bb.data.createCopy(d) + overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + variant + localdata.setVar("OVERRIDES", overrides) + bb.data.update_data(localdata) + pkgarchs_ml = localdata.getVar('PACKAGE_EXTRA_ARCHS').split() + for arch in pkgarchs_ml: + if arch not in pkgarchs: + pkgarchs.append(arch) + targetdir = targetsysroot + bb.debug(1, 'pkgarchs: %s' % pkgarchs) + bb.utils.mkdirhier(targetdir) for pkgarch in pkgarchs: for manifest in glob.glob(d.expand("${SSTATE_MANIFESTS}/manifest-%s-*.populate_sysroot" % pkgarch)): |