aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib_global.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-26 12:56:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-26 14:40:54 +0100
commitf50c5d36b2da9b36d56d95a7d89404509a1a3e9b (patch)
treec2c685ec252a83c72fd9078615a40f4cc532a8ca /meta/classes/multilib_global.bbclass
parent9e31c748327e92b809330f4ad7b6aaecb2edf559 (diff)
downloadopenembedded-core-contrib-f50c5d36b2da9b36d56d95a7d89404509a1a3e9b.tar.gz
packagedata/multilib: Fix search patch for multilib builds
The current multilib search path code for packagedata is flawed since it doesn't correctly handle changes in the TARGET_VENDOR/TARGET_OS that multilib may make. This patch enhances the code to correctly build the search paths so multilib packagedata is found correctly. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
-rw-r--r--meta/classes/multilib_global.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index b76fd94162c..f55e3a25aae 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -2,6 +2,11 @@ python multilib_virtclass_handler_global () {
if not e.data:
return
+ if isinstance(e, bb.event.RecipePreFinalise):
+ for v in e.data.getVar("MULTILIB_VARIANTS", True).split():
+ if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + v, False) is None:
+ e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + v, e.data.getVar("TARGET_VENDOR", False) + "ml" + v)
+
variant = e.data.getVar("BBEXTENDVARIANT", True)
if isinstance(e, bb.event.RecipeParsed) and not variant: