[1/2] staging: Code cleanup

Submitted by Richard Purdie on June 30, 2019, 9:19 a.m. | Patch ID: 162650

Details

Message ID 20190630091956.3314-1-richard.purdie@linuxfoundation.org
State Master Next
Commit 288b04c8a31fcf257219a57e23663b74178c75f2
Headers show

Commit Message

Richard Purdie June 30, 2019, 9:19 a.m.
multiconfig dependencies no longer appear in BB_TASKDEPDATA so we can drop
this code.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/staging.bbclass | 7 -------
 1 file changed, 7 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 92070602228..94c85248daf 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -261,12 +261,10 @@  python extend_recipe_sysroot() {
     workdir = d.getVar("WORKDIR")
     #bb.warn(str(taskdepdata))
     pn = d.getVar("PN")
-    mc = d.getVar("BB_CURRENT_MC")
     stagingdir = d.getVar("STAGING_DIR")
     sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
     recipesysroot = d.getVar("RECIPE_SYSROOT")
     recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
-    current_variant = d.getVar("BBEXTENDVARIANT")
 
     # Detect bitbake -b usage
     nodeps = d.getVar("BB_LIMITEDDEPS") or False
@@ -452,11 +450,6 @@  python extend_recipe_sysroot() {
     msg_adding = []
 
     for dep in configuredeps:
-        if mc != 'default':
-            # We should not care about other multiconfigs
-            depmc = dep.split(':')[1]
-            if depmc != mc:
-                continue
         c = setscenedeps[dep][0]
         if c not in installed:
             continue