From 7767b14a3455a6dad797609729662f9edb2dd3ba Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 6 Mar 2023 17:57:15 +0000 Subject: [PATCH] staging: Separate out different multiconfig manifests """ 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. (From OE-Core rev: 29f7390add28d3a6fb6854bc750d1db3d969f027) Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/classes/staging.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index bf8ca58b0b..885bd347e0 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -269,6 +269,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")