summaryrefslogtreecommitdiffstats
path: root/meta/classes/sanity.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/sanity.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/sanity.bbclass')
-rw-r--r--meta/classes/sanity.bbclass4
1 files changed, 4 insertions, 0 deletions
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):
114 tune_error_set.append(tune_errors) 114 tune_error_set.append(tune_errors)
115 115
116 multilibs = (data.getVar("MULTILIB_VARIANTS", True) or "").split() 116 multilibs = (data.getVar("MULTILIB_VARIANTS", True) or "").split()
117 global_multilibs = (data.getVar("MULTILIB_GLOBAL_VARIANTS", True) or "").split()
118
117 if multilibs: 119 if multilibs:
118 seen_libs = [] 120 seen_libs = []
119 seen_tunes = [] 121 seen_tunes = []
@@ -122,6 +124,8 @@ def check_toolchain(data):
122 tune_error_set.append("The multilib '%s' appears more than once." % lib) 124 tune_error_set.append("The multilib '%s' appears more than once." % lib)
123 else: 125 else:
124 seen_libs.append(lib) 126 seen_libs.append(lib)
127 if not lib in global_multilibs:
128 tune_error_set.append("Multilib %s is not present in MULTILIB_GLOBAL_VARIANTS" % lib)
125 tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True) 129 tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True)
126 if tune in seen_tunes: 130 if tune in seen_tunes:
127 tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune) 131 tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune)