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.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/classes/multilib.bbclass') 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 () { if bb.data.inherits_class('nativesdk', e.data) or bb.data.inherits_class('crosssdk', e.data): raise bb.parse.SkipPackage("We can't extend nativesdk recipes") + if bb.data.inherits_class('allarch', e.data) and not bb.data.inherits_class('packagegroup', e.data): + raise bb.parse.SkipPackage("Don't extend allarch recipes which are not packagegroups") + save_var_name=e.data.getVar("MULTILIB_SAVE_VARNAME", True) or "" for name in save_var_name.split(): val=e.data.getVar(name, True) -- cgit 1.2.3-korg