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-20 16:38:51 -1000
commiteb9c6f7ac91431a6296789c23900f2a3016ef619 (patch)
tree18e277e1408533a64bd68cd8befc853dbef185ac
parent06271fd8d26bc34448524157077c23eb1ea29c52 (diff)
downloadopenembedded-core-contrib-eb9c6f7ac91431a6296789c23900f2a3016ef619.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/staging.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 78eb914921..4177e6cf05 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -267,6 +267,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")