aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/staging.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r--meta/classes/staging.bbclass9
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 75bec84127..91ae1e8fc1 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -519,6 +519,15 @@ python extend_recipe_sysroot() {
else:
pkgarchs = ['${MACHINE_ARCH}']
pkgarchs = pkgarchs + list(reversed(d2.getVar("PACKAGE_EXTRA_ARCHS").split()))
+ # Search multilib archs for multilib image recipe like lib32-core-image-minimal
+ mlprefix = d2.getVar('MLPREFIX')
+ if bb.data.inherits_class('image', d2) and mlprefix:
+ ml_variant = mlprefix.rstrip('-')
+ override = ":virtclass-multilib-" + ml_variant
+ localdata = bb.data.createCopy(d2)
+ overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + ml_variant
+ localdata.setVar("OVERRIDES", overrides)
+ pkgarchs = pkgarchs + list(reversed(localdata.getVar("PACKAGE_EXTRA_ARCHS").split()))
pkgarchs.append('allarch')
for pkgarch in pkgarchs:
manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-%s-%s.populate_sysroot" % (pkgarch, c))