summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib_global.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:42:48 +0000
commitbc4da2573dfb59ea2fc4af359701818df20f7663 (patch)
treeceeb846e355f951f086a0c5ecba09445fce4e8b9 /meta/classes/multilib_global.bbclass
parentca055169789b399e8a581350fecb58e21094fbf0 (diff)
downloadopenembedded-core-contrib-bc4da2573dfb59ea2fc4af359701818df20f7663.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] Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
-rw-r--r--meta/classes/multilib_global.bbclass5
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 () {
variant = e.data.getVar("BBEXTENDVARIANT", True)
if isinstance(e, bb.event.RecipeParsed) and not variant:
- if bb.data.inherits_class('kernel', e.data) or bb.data.inherits_class('module-base', e.data):
+ if bb.data.inherits_class('kernel', e.data) or \
+ bb.data.inherits_class('module-base', e.data) or \
+ (bb.data.inherits_class('allarch', e.data) and\
+ not bb.data.inherits_class('packagegroup', e.data)):
variants = (e.data.getVar("MULTILIB_VARIANTS", True) or "").split()
import oe.classextend