diff options
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 41df883495..27b012ecbd 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -256,7 +256,7 @@ python extend_recipe_sysroot() { | |||
256 | workdir = d.getVar("WORKDIR") | 256 | workdir = d.getVar("WORKDIR") |
257 | #bb.warn(str(taskdepdata)) | 257 | #bb.warn(str(taskdepdata)) |
258 | pn = d.getVar("PN") | 258 | pn = d.getVar("PN") |
259 | 259 | mc = d.getVar("BB_CURRENT_MC") | |
260 | stagingdir = d.getVar("STAGING_DIR") | 260 | stagingdir = d.getVar("STAGING_DIR") |
261 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" | 261 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" |
262 | recipesysroot = d.getVar("RECIPE_SYSROOT") | 262 | recipesysroot = d.getVar("RECIPE_SYSROOT") |
@@ -443,7 +443,13 @@ python extend_recipe_sysroot() { | |||
443 | 443 | ||
444 | msg_exists = [] | 444 | msg_exists = [] |
445 | msg_adding = [] | 445 | msg_adding = [] |
446 | |||
446 | for dep in configuredeps: | 447 | for dep in configuredeps: |
448 | if mc != 'default': | ||
449 | # We should not care about other multiconfigs | ||
450 | depmc = dep.split(':')[1] | ||
451 | if depmc != mc: | ||
452 | continue | ||
447 | c = setscenedeps[dep][0] | 453 | c = setscenedeps[dep][0] |
448 | if c not in installed: | 454 | if c not in installed: |
449 | continue | 455 | continue |