From 288b04c8a31fcf257219a57e23663b74178c75f2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 28 Jun 2019 17:49:41 +0100 Subject: staging: Code cleanup multiconfig dependencies no longer appear in BB_TASKDEPDATA so we can drop this code. Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 7 ------- 1 file changed, 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() { 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 -- cgit 1.2.3-korg