summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib.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 15:02:25 +0100
commit42e8c8056719326b68b1602e0699eba00a924d2b (patch)
tree277665763728ca4567a3770b09f045c06a0c244d /meta/classes/multilib.bbclass
parent8593c6c1d8995f449a41a99c6e3242e2e58e79a5 (diff)
downloadpoky-42e8c8056719326b68b1602e0699eba00a924d2b.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. (From OE-Core rev: f50c5d36b2da9b36d56d95a7d89404509a1a3e9b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib.bbclass')
-rw-r--r--meta/classes/multilib.bbclass2
1 files changed, 0 insertions, 2 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 7d5fc41535..76cbac6d6a 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -36,8 +36,6 @@ python multilib_virtclass_handler () {
36 e.data.setVar("MLPREFIX", variant + "-") 36 e.data.setVar("MLPREFIX", variant + "-")
37 e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) 37 e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
38 e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant) 38 e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
39 if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
40 e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
41 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) 39 e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
42} 40}
43 41