diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-26 12:56:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-26 14:40:54 +0100 |
| commit | f50c5d36b2da9b36d56d95a7d89404509a1a3e9b (patch) | |
| tree | c2c685ec252a83c72fd9078615a40f4cc532a8ca /meta/classes | |
| parent | 9e31c748327e92b809330f4ad7b6aaecb2edf559 (diff) | |
| download | openembedded-core-f50c5d36b2da9b36d56d95a7d89404509a1a3e9b.tar.gz openembedded-core-f50c5d36b2da9b36d56d95a7d89404509a1a3e9b.tar.bz2 openembedded-core-f50c5d36b2da9b36d56d95a7d89404509a1a3e9b.zip | |
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')
| -rw-r--r-- | meta/classes/multilib.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 5 |
2 files changed, 5 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 () { e.data.setVar("MLPREFIX", variant + "-") e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant) - if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None: - e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant) e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override) } diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index b76fd94162..f55e3a25aa 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: |