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 15:02:25 +0100 |
| commit | 42e8c8056719326b68b1602e0699eba00a924d2b (patch) | |
| tree | 277665763728ca4567a3770b09f045c06a0c244d /meta/classes/multilib_global.bbclass | |
| parent | 8593c6c1d8995f449a41a99c6e3242e2e58e79a5 (diff) | |
| download | openembedded-core-contrib-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_global.bbclass')
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 5 |
1 files changed, 5 insertions, 0 deletions
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: |