From bc4da2573dfb59ea2fc4af359701818df20f7663 Mon Sep 17 00:00:00 2001 From: Constantin Musca Date: Mon, 24 Dec 2012 13:28:38 +0200 Subject: 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 Signed-off-by: Saul Wold --- meta/classes/multilib_global.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes/multilib_global.bbclass') 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 -- cgit v1.2.3