diff options
| -rw-r--r-- | meta/classes/multilib.bbclass | 3 | ||||
| -rw-r--r-- | meta/classes/multilib_global.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 30 | ||||
| -rw-r--r-- | meta/classes/sanity.bbclass | 4 | ||||
| -rw-r--r-- | meta/conf/multilib.conf | 2 |
5 files changed, 43 insertions, 1 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index 09c08eddd0c..f5f3c693635 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) diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass index f55e3a25aae..529e82a8bdc 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 diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 9885d941012..1ac65510c7c 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1132,6 +1132,20 @@ python emit_pkgdata() { size = 0 return size + def write_extra_pkgs(variants, pn, packages, pkgdatadir): + for variant in variants: + with open("%s/%s-%s" % (pkgdatadir, variant, pn), 'w') as fd: + fd.write("PACKAGES: %s\n" % ' '.join( + map(lambda pkg: '%s-%s' % (variant, pkg), packages.split()))) + + def write_extra_runtime_pkgs(variants, packages, pkgdatadir): + for variant in variants: + for pkg in packages.split(): + ml_pkg = "%s-%s" % (variant, pkg) + subdata_file = "%s/runtime/%s" % (pkgdatadir, ml_pkg) + with open(subdata_file, 'w') as fd: + fd.write("PKG_%s: %s" % (ml_pkg, pkg)) + packages = d.getVar('PACKAGES', True) pkgdest = d.getVar('PKGDEST', True) pkgdatadir = d.getVar('PKGDESTWORK', True) @@ -1144,6 +1158,16 @@ python emit_pkgdata() { f.write("PACKAGES: %s\n" % packages) f.close() + pn = d.getVar('PN', True) + global_variants = (d.getVar('MULTILIB_GLOBAL_VARIANTS', True) or "").split() + variants = (d.getVar('MULTILIB_VARIANTS', True) or "").split() + + if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d): + write_extra_pkgs(variants, pn, packages, pkgdatadir) + + if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)): + write_extra_pkgs(global_variants, pn, packages, pkgdatadir) + workdir = d.getVar('WORKDIR', True) for pkg in packages.split(): @@ -1198,6 +1222,12 @@ python emit_pkgdata() { packagedfile = pkgdatadir + '/runtime/%s.packaged' % pkg file(packagedfile, 'w').close() + if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d): + write_extra_runtime_pkgs(variants, packages, pkgdatadir) + + if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d): + write_extra_runtime_pkgs(global_variants, packages, pkgdatadir) + bb.utils.unlockfile(lf) } emit_pkgdata[dirs] = "${PKGDESTWORK}/runtime ${PKGDESTWORK}/runtime-reverse" diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index 5b4f070ec48..0ffa52dedf3 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) diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf index b22a4cb9649..97b53eccf77 100644 --- a/meta/conf/multilib.conf +++ b/meta/conf/multilib.conf @@ -12,3 +12,5 @@ STAGING_DIR_TARGET = "${STAGING_DIR}/${MLPREFIX}${MACHINE}" INHERIT += "multilib_global" BBCLASSEXTEND_append = " ${MULTILIBS}" + +MULTILIB_GLOBAL_VARIANTS = "lib32 lib64 libx32" |