From 1674541ed83fa4645f2e078f65fe0f878527ee6e 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] (From OE-Core rev: bc4da2573dfb59ea2fc4af359701818df20f7663) Signed-off-by: Constantin Musca Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/sanity.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/sanity.bbclass') diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5b4f070ec4..0ffa52dedf 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -114,6 +114,8 @@ def check_toolchain(data): tune_error_set.append(tune_errors) multilibs = (data.getVar("MULTILIB_VARIANTS", True) or "").split() + global_multilibs = (data.getVar("MULTILIB_GLOBAL_VARIANTS", True) or "").split() + if multilibs: seen_libs = [] seen_tunes = [] @@ -122,6 +124,8 @@ def check_toolchain(data): tune_error_set.append("The multilib '%s' appears more than once." % lib) else: seen_libs.append(lib) + if not lib in global_multilibs: + tune_error_set.append("Multilib %s is not present in MULTILIB_GLOBAL_VARIANTS" % lib) tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True) if tune in seen_tunes: tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune) -- cgit v1.2.3-54-g00ecf