diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-28 17:49:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-30 22:40:52 +0100 |
commit | b9bf7d26827fc12d94981efc4920ac367c3c9fce (patch) | |
tree | 2b2029b144c6ed7eeb3a7ad8497565793a74996c /meta | |
parent | fa65c61b3df826d722df0981a0d2fb82e1e99ba4 (diff) | |
download | poky-b9bf7d26827fc12d94981efc4920ac367c3c9fce.tar.gz |
staging: Code cleanup
multiconfig dependencies no longer appear in BB_TASKDEPDATA so we can drop
this code.
(From OE-Core rev: 288b04c8a31fcf257219a57e23663b74178c75f2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/staging.bbclass | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 9207060222..94c85248da 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -261,12 +261,10 @@ python extend_recipe_sysroot() { | |||
261 | workdir = d.getVar("WORKDIR") | 261 | workdir = d.getVar("WORKDIR") |
262 | #bb.warn(str(taskdepdata)) | 262 | #bb.warn(str(taskdepdata)) |
263 | pn = d.getVar("PN") | 263 | pn = d.getVar("PN") |
264 | mc = d.getVar("BB_CURRENT_MC") | ||
265 | stagingdir = d.getVar("STAGING_DIR") | 264 | stagingdir = d.getVar("STAGING_DIR") |
266 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" | 265 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" |
267 | recipesysroot = d.getVar("RECIPE_SYSROOT") | 266 | recipesysroot = d.getVar("RECIPE_SYSROOT") |
268 | recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") | 267 | recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") |
269 | current_variant = d.getVar("BBEXTENDVARIANT") | ||
270 | 268 | ||
271 | # Detect bitbake -b usage | 269 | # Detect bitbake -b usage |
272 | nodeps = d.getVar("BB_LIMITEDDEPS") or False | 270 | nodeps = d.getVar("BB_LIMITEDDEPS") or False |
@@ -452,11 +450,6 @@ python extend_recipe_sysroot() { | |||
452 | msg_adding = [] | 450 | msg_adding = [] |
453 | 451 | ||
454 | for dep in configuredeps: | 452 | for dep in configuredeps: |
455 | if mc != 'default': | ||
456 | # We should not care about other multiconfigs | ||
457 | depmc = dep.split(':')[1] | ||
458 | if depmc != mc: | ||
459 | continue | ||
460 | c = setscenedeps[dep][0] | 453 | c = setscenedeps[dep][0] |
461 | if c not in installed: | 454 | if c not in installed: |
462 | continue | 455 | continue |