diff options
Diffstat (limited to 'meta/classes-global/staging.bbclass')
-rw-r--r-- | meta/classes-global/staging.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index e6d0d1d55c..a058d344fd 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass | |||
@@ -275,9 +275,10 @@ python extend_recipe_sysroot() { | |||
275 | pn = d.getVar("PN") | 275 | pn = d.getVar("PN") |
276 | stagingdir = d.getVar("STAGING_DIR") | 276 | stagingdir = d.getVar("STAGING_DIR") |
277 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" | 277 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" |
278 | mlprefix = d.getVar("MLPREFIX") | 278 | # only needed by multilib cross-canadian since it redefines RECIPE_SYSROOT |
279 | if mlprefix: | 279 | manifestprefix = d.getVar("RECIPE_SYSROOT_MANIFEST_SUBDIR") |
280 | sharedmanifests = sharedmanifests + "/" + mlprefix | 280 | if manifestprefix: |
281 | sharedmanifests = sharedmanifests + "/" + manifestprefix | ||
281 | recipesysroot = d.getVar("RECIPE_SYSROOT") | 282 | recipesysroot = d.getVar("RECIPE_SYSROOT") |
282 | recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") | 283 | recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") |
283 | 284 | ||