diff options
Diffstat (limited to 'meta/classes/staging.bbclass')
-rw-r--r-- | meta/classes/staging.bbclass | 4 |
1 files changed, 4 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() { | |||
471 | os.symlink(c + "." + taskhash, depdir + "/" + c) | 471 | os.symlink(c + "." + taskhash, depdir + "/" + c) |
472 | 472 | ||
473 | manifest, d2 = oe.sstatesig.find_sstate_manifest(c, setscenedeps[dep][2], "populate_sysroot", d, multilibs) | 473 | manifest, d2 = oe.sstatesig.find_sstate_manifest(c, setscenedeps[dep][2], "populate_sysroot", d, multilibs) |
474 | if d2 is not d: | ||
475 | # If we don't do this, the recipe sysroot will be placed in the wrong WORKDIR for multilibs | ||
476 | # We need a consistent WORKDIR for the image | ||
477 | d2.setVar("WORKDIR", d.getVar("WORKDIR")) | ||
474 | destsysroot = d2.getVar("RECIPE_SYSROOT") | 478 | destsysroot = d2.getVar("RECIPE_SYSROOT") |
475 | 479 | ||
476 | native = False | 480 | native = False |