summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-03-06 17:57:15 +0000
committerSteve Sakoman <steve@sakoman.com>2023-03-16 04:35:11 -1000
commitf586498fbaff190d48e4fc927e324c5371df4b17 (patch)
treeb320745fe3d4b3cdab8257cbcae9b8eded165579
parent9f328a42a289dd7d77bd6f08605b0ccb813b2056 (diff)
downloadopenembedded-core-f586498fbaff190d48e4fc927e324c5371df4b17.tar.gz
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 891d3faa3ed3d1cc231da58e5fa1325f05d5ade5) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes-global/staging.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes-global/staging.bbclass b/meta/classes-global/staging.bbclass
index 5a1f43de78..e6d0d1d55c 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")