diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2012-12-24 13:28:38 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-31 09:43:25 +0000 |
commit | 1674541ed83fa4645f2e078f65fe0f878527ee6e (patch) | |
tree | 3b0b2c5ce95eee3090f05058e52369490852fef4 /meta/classes/multilib_global.bbclass | |
parent | 415c4fa12c83dacc6b107d0f857ea299a68b0eca (diff) | |
download | poky-1674541ed83fa4645f2e078f65fe0f878527ee6e.tar.gz |
multilib: fix allarch/kernel/module-base multilib issues
- skip the non-packagegroup allarch recipes in multilib_virtclass_handler
- extend PROVIDES/RPROVIDES for allarch recipes which are not packagegroups
- use variants from MULTILIB_GLOBAL_VARIANTS (lib32 lib64 libx32) to create
additional pkgdata files for multilib allarch: ${pkgdatadir}/${variant}-${PN}
and ${pkgdatadir}/runtime/${variant}-${pkg}
- use variants from MULTILIB_VARIANTS to create additional pkgdata files
for multilib kernel/module-base recipes
- add a sanity check to determine if the current multilib is in
MULTILIB_GLOBAL_VARIANTS
[YOCTO #2918]
[YOCTO #3440]
[YOCTO #3565]
[YOCTO #3568]
(From OE-Core rev: bc4da2573dfb59ea2fc4af359701818df20f7663)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
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, 4 insertions, 1 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index f55e3a25aa..529e82a8bd 100644 --- a/meta/classes/multilib_global.bbclass +++ b/meta/classes/multilib_global.bbclass | |||
@@ -10,7 +10,10 @@ python multilib_virtclass_handler_global () { | |||
10 | variant = e.data.getVar("BBEXTENDVARIANT", True) | 10 | variant = e.data.getVar("BBEXTENDVARIANT", True) |
11 | 11 | ||
12 | if isinstance(e, bb.event.RecipeParsed) and not variant: | 12 | if isinstance(e, bb.event.RecipeParsed) and not variant: |
13 | if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data): | 13 | if bb.data.inherits_class('kernel', e.data) or \ |
14 | bb.data.inherits_class('module-base', e.data) or \ | ||
15 | (bb.data.inherits_class('allarch', e.data) and\ | ||
16 | not bb.data.inherits_class('packagegroup', e.data)): | ||
14 | variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split() | 17 | variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split() |
15 | 18 | ||
16 | import oe.classextend | 19 | import oe.classextend |