staging: fix up multilib destsysroot path

PATCH New Dan Dedrick 1 participant 1 message Nov 8, 2017

Share & tools

Dan Dedrick

author

2017-11-08 22:15 UTC #0 lore raw

PATCH 1/1 staging: fix up multilib destsysroot path

The issues here was that WORKDIR changes based on the multilib variant and the WORKDIR is used in the RECIPE_SYSROOT path. We need to use the same WORKDIR that everything else is using so reset it before we expand RECIPE_SYSROOT.

Signed-off-by Dan Dedrick <[email protected]>

---
 meta/classes/staging.bbclass | 1 +
 1 file changed, 1 insertion(+)

meta/classes/staging.bbclass +1 -0

index c479bd93ea..bd2ecd4776 100644
@@ -479,6 +479,7 @@ python extend_recipe_sysroot() {
                 if variant not in multilibs:
                     multilibs[variant] = get_multilib_datastore(variant, d)
                 d2 = multilibs[variant]
+                d2.setVar("WORKDIR", d.getVar("WORKDIR"))
                 destsysroot = d2.getVar("RECIPE_SYSROOT")
 
         native = False

Signature · 1 line

2.13.6