Message ID | 20230306175715.2367039-1-richard.purdie@linuxfoundation.org |
---|---|
State | Accepted, archived |
Commit | 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5 |
Headers | show |
Series | staging: Separate out different multiconfig manifests | expand |
diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass index 5a1f43de780..e6d0d1d55cf 100644 --- a/meta/classes-global/staging.bbclass +++ b/meta/classes-global/staging.bbclass @@ -275,6 +275,9 @@ python extend_recipe_sysroot() { pn = d.getVar("PN") stagingdir = d.getVar("STAGING_DIR") sharedmanifests = d.getVar("COMPONENTS_DIR") + "/manifests" + mlprefix = d.getVar("MLPREFIX") + if mlprefix: + sharedmanifests = sharedmanifests + "/" + mlprefix recipesysroot = d.getVar("RECIPE_SYSROOT") recipesysrootnative = d.getVar("RECIPE_SYSROOT_NATIVE")
""" require conf/multilib.conf MACHINE = "qemuarm64" MULTILIBS = "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon" bitbake gcc-cross-canadian-arm """ and then inspecting the lib32* manifest files under recipe-sysroot-native shows them referencing lib32-recipe-sysroot instead of recipe-sysroot as used by gcc-cross-canadian recipes. To fix this separate out the manifest by multilib. It is caching mechanism to optimise disk usage so this doesn't break anything, just separated out some files. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/classes-global/staging.bbclass | 3 +++ 1 file changed, 3 insertions(+)