diff options
| author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-10-16 15:16:25 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-04 10:19:53 +0000 |
| commit | 7ca012fb3addb11ba3f899efa0619ddd8d3c6946 (patch) | |
| tree | 8ea6ba8eedfdc1b9a1582fa36c6d938098a079bb /meta | |
| parent | 43a1c2dc08b4291e042b6c9ef981bd094ea2c477 (diff) | |
| download | openembedded-core-7ca012fb3addb11ba3f899efa0619ddd8d3c6946.tar.gz openembedded-core-7ca012fb3addb11ba3f899efa0619ddd8d3c6946.tar.bz2 openembedded-core-7ca012fb3addb11ba3f899efa0619ddd8d3c6946.zip | |
multilib.bbclass: fix incorrect TARGET_VENDOR in multilib image
While building multilib extended images such as libXX-core-image-minimal,
the WORKDIR has the same dir with the building of core-image-minimal.
$ ls tmp/work/qemux86_64-poky-linux/ -al
...
drwxrwxr-x 3 jiahongxu jiahongxu 4096 Oct 13 16:01 core-image-minimal
drwxrwxr-x 3 jiahongxu jiahongxu 4096 Oct 16 11:11 lib32-core-image-minimal
...
While image class is inherited, it did not assign OVERRIDES with
'virtclass-multilib-libXXX', so the reason is variable TARGET_VENDOR was
not override for multilib in that situation.
It refers what did for PN and MLPREFIX, and manually do the multilib
override for TARGET_VENDOR in RecipePreFinalise handler.
[YOCTO #6844]
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/multilib.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 6e143dd70d..2a90d9ef29 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass @@ -21,6 +21,9 @@ python multilib_virtclass_handler () { if bb.data.inherits_class('image', e.data): e.data.setVar("MLPREFIX", variant + "-") e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) + target_vendor = e.data.getVar("TARGET_VENDOR_" + "virtclass-multilib-" + variant, False) + if target_vendor: + e.data.setVar("TARGET_VENDOR", target_vendor) return if bb.data.inherits_class('cross-canadian', e.data): |