summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib.bbclass
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-12-24 13:28:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-31 09:43:25 +0000
commit1674541ed83fa4645f2e078f65fe0f878527ee6e (patch)
tree3b0b2c5ce95eee3090f05058e52369490852fef4 /meta/classes/multilib.bbclass
parent415c4fa12c83dacc6b107d0f857ea299a68b0eca (diff)
downloadpoky-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.bbclass')
-rw-r--r--meta/classes/multilib.bbclass3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 09c08eddd0..f5f3c69363 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -31,6 +31,9 @@ python multilib_virtclass_handler () {
31 if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data): 31 if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data):
32 raise bb.parse.SkipPackage("We can't extend nativesdk recipes") 32 raise bb.parse.SkipPackage("We can't extend nativesdk recipes")
33 33
34 if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data):
35 raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups")
36
34 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" 37 save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or ""
35 for name in save_var_name.split(): 38 for name in save_var_name.split():
36 val=e.data.getVar(name, True) 39 val=e.data.getVar(name, True)