aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-28 17:49:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-06-30 13:51:31 +0100
commit288b04c8a31fcf257219a57e23663b74178c75f2 (patch)
tree933e2656b0b5aa0985321c775edea6900a662385
parenta8c370a9ff2c6f7d7d516ef69cc2c4c8b8279f61 (diff)
downloadopenembedded-core-contrib-288b04c8a31fcf257219a57e23663b74178c75f2.tar.gz
openembedded-core-contrib-288b04c8a31fcf257219a57e23663b74178c75f2.tar.bz2
openembedded-core-contrib-288b04c8a31fcf257219a57e23663b74178c75f2.zip
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>
-rw-r--r--meta/classes/staging.bbclass7
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() {
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