Skip to contentSkip to conversation

staging.bbclass: Avoid looking at other multiconfigs on extend_recipe_sysroot

PATCH New Alejandro Enedino Hernandez Samaniego 1 participant 1 message Jan 6, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 staging.bbclass: Avoid looking at other multiconfigs on extend_recipe_sysroot

On extend_recipe_sysroot we only compare taskname and pn, but if we have some dependency to a recipe from another multiconfig, these two will still match if it is the same recipe, causing an error since the build system believes it has already proccesed that dependency.

Check if this is a multiconfig build, if it is, make sure the current dependency is coming from the same multiconfig as the one we are building.

---
 meta/classes/staging.bbclass | 4 ++++
 1 file changed, 4 insertions(+)
meta/classes/staging.bbclass +4 -0
index 84e13ba..2dbe65a 100644
@@ -277,6 +277,10 @@ python extend_recipe_sysroot() {
     for dep in taskdepdata:
         data = taskdepdata[dep]
         if data[1] == mytaskname and data[0] == pn:
+            if mc != 'default':
+                depmc = dep.split(':')[1]
+                if depmc != mc:
+                    continue
             start = dep
             break
     if start is None:
Signature · 1 line
2.7.4