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

Submitted by Alejandro Enedino Hernandez Samaniego on Jan. 5, 2019, 9:18 p.m. | Patch ID: 157586

Details

Message ID 1546723102-28031-1-git-send-email-alejandr@xilinx.com
State New
Headers show

Commit Message

Alejandro Enedino Hernandez Samaniego Jan. 5, 2019, 9:18 p.m.
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.

Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandr@xilinx.com>
---
 meta/classes/staging.bbclass | 4 ++++
 1 file changed, 4 insertions(+)

Patch hide | download patch | download mbox

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 84e13ba..2dbe65a 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -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: