diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/multilib.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/staging.bbclass | 7 |
2 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 5859ca8d21..a0be559970 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
@@ -45,6 +45,7 @@ python multilib_virtclass_handler () { | |||
45 | e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") | 45 | e.data.setVar("RECIPE_SYSROOT", "${WORKDIR}/recipe-sysroot") |
46 | e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") | 46 | e.data.setVar("STAGING_DIR_TARGET", "${WORKDIR}/recipe-sysroot") |
47 | e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") | 47 | e.data.setVar("STAGING_DIR_HOST", "${WORKDIR}/recipe-sysroot") |
48 | e.data.setVar("RECIPE_SYSROOT_MANIFEST_SUBDIR", "nativesdk-" + variant) | ||
48 | e.data.setVar("MLPREFIX", variant + "-") | 49 | e.data.setVar("MLPREFIX", variant + "-") |
49 | override = ":virtclass-multilib-" + variant | 50 | override = ":virtclass-multilib-" + variant |
50 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) | 51 | e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) |
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index 885bd347e0..044873c9ae 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass | |||
@@ -269,9 +269,10 @@ python extend_recipe_sysroot() { | |||
269 | pn = d.getVar("PN") | 269 | pn = d.getVar("PN") |
270 | stagingdir = d.getVar("STAGING_DIR") | 270 | stagingdir = d.getVar("STAGING_DIR") |
271 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" | 271 | sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" |
272 | mlprefix = d.getVar("MLPREFIX") | 272 | # only needed by multilib cross-canadian since it redefines RECIPE_SYSROOT |
273 | if mlprefix: | 273 | manifestprefix = d.getVar("RECIPE_SYSROOT_MANIFEST_SUBDIR") |
274 | sharedmanifests = sharedmanifests + "/" + mlprefix | 274 | if manifestprefix: |
275 | sharedmanifests = sharedmanifests + "/" + manifestprefix | ||
275 | recipesysroot = d.getVar("RECIPE_SYSROOT") | 276 | recipesysroot = d.getVar("RECIPE_SYSROOT") |
276 | recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") | 277 | recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE") |
277 | 278 | ||