mirror of
https://git.yoctoproject.org/poky
synced 2026-05-09 17:39:31 +00:00
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>
This commit is contained in:
@@ -261,12 +261,10 @@ python extend_recipe_sysroot() {
|
|||||||
workdir = d.getVar("WORKDIR")
|
workdir = d.getVar("WORKDIR")
|
||||||
#bb.warn(str(taskdepdata))
|
#bb.warn(str(taskdepdata))
|
||||||
pn = d.getVar("PN")
|
pn = d.getVar("PN")
|
||||||
mc = d.getVar("BB_CURRENT_MC")
|
|
||||||
stagingdir = d.getVar("STAGING_DIR")
|
stagingdir = d.getVar("STAGING_DIR")
|
||||||
sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
|
sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests"
|
||||||
recipesysroot = d.getVar("RECIPE_SYSROOT")
|
recipesysroot = d.getVar("RECIPE_SYSROOT")
|
||||||
recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
|
recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
|
||||||
current_variant = d.getVar("BBEXTENDVARIANT")
|
|
||||||
|
|
||||||
# Detect bitbake -b usage
|
# Detect bitbake -b usage
|
||||||
nodeps = d.getVar("BB_LIMITEDDEPS") or False
|
nodeps = d.getVar("BB_LIMITEDDEPS") or False
|
||||||
@@ -452,11 +450,6 @@ python extend_recipe_sysroot() {
|
|||||||
msg_adding = []
|
msg_adding = []
|
||||||
|
|
||||||
for dep in configuredeps:
|
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]
|
c = setscenedeps[dep][0]
|
||||||
if c not in installed:
|
if c not in installed:
|
||||||
continue
|
continue
|
||||||
|
|||||||
Reference in New Issue
Block a user