diff options
| -rw-r--r-- | meta/classes/staging.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/utils.bbclass | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 3fcbc9f15d..f04c7b637d 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -471,6 +471,10 @@ python extend_recipe_sysroot() { os.symlink(c + "." + taskhash, depdir + "/" + c) manifest, d2 = oe.sstatesig.find_sstate_manifest(c, setscenedeps[dep][2], "populate_sysroot", d, multilibs) + if d2 is not d: + # If we don't do this, the recipe sysroot will be placed in the wrong WORKDIR for multilibs + # We need a consistent WORKDIR for the image + d2.setVar("WORKDIR", d.getVar("WORKDIR")) destsysroot = d2.getVar("RECIPE_SYSROOT") native = False diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass index 4f016e3d00..3f4f51b56b 100644 --- a/meta/classes/utils.bbclass +++ b/meta/classes/utils.bbclass @@ -338,6 +338,8 @@ def all_multilib_tune_values(d, var, unique = True, need_split = True, delim = ' variants = d.getVar("MULTILIB_VARIANTS") or "" for item in variants.split(): localdata = get_multilib_datastore(item, d) + # We need WORKDIR to be consistent with the original datastore + localdata.setVar("WORKDIR", d.getVar("WORKDIR")) value = localdata.getVar(var) or "" if value != "": if need_split: |