From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 28 Jun 2019 16:49:41 +0000 (+0100)
Subject: staging: Code cleanup
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~14007
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=288b04c8a31fcf257219a57e23663b74178c75f2;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

staging: Code cleanup

multiconfig dependencies no longer appear in BB_TASKDEPDATA so we can drop
this code.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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