diff options
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r-- | meta/classes/package.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 0b6f65a855..d1e9138c66 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -494,7 +494,8 @@ def get_package_mapping (pkg, basepkg, d): | |||
494 | 494 | ||
495 | if key in data: | 495 | if key in data: |
496 | # Have to avoid undoing the write_extra_pkgs(global_variants...) | 496 | # Have to avoid undoing the write_extra_pkgs(global_variants...) |
497 | if bb.data.inherits_class('allarch', d) and data[key] == basepkg: | 497 | if bb.data.inherits_class('allarch', d) and not d.getVar('MULTILIB_VARIANTS') \ |
498 | and data[key] == basepkg: | ||
498 | return pkg | 499 | return pkg |
499 | return data[key] | 500 | return data[key] |
500 | 501 | ||
@@ -1413,7 +1414,8 @@ fi | |||
1413 | if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d): | 1414 | if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d): |
1414 | write_extra_pkgs(variants, pn, packages, pkgdatadir) | 1415 | write_extra_pkgs(variants, pn, packages, pkgdatadir) |
1415 | 1416 | ||
1416 | if (bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d)): | 1417 | if bb.data.inherits_class('allarch', d) and not variants \ |
1418 | and not bb.data.inherits_class('packagegroup', d): | ||
1417 | write_extra_pkgs(global_variants, pn, packages, pkgdatadir) | 1419 | write_extra_pkgs(global_variants, pn, packages, pkgdatadir) |
1418 | 1420 | ||
1419 | workdir = d.getVar('WORKDIR') | 1421 | workdir = d.getVar('WORKDIR') |
@@ -1502,7 +1504,8 @@ fi | |||
1502 | if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d): | 1504 | if bb.data.inherits_class('kernel', d) or bb.data.inherits_class('module-base', d): |
1503 | write_extra_runtime_pkgs(variants, packages, pkgdatadir) | 1505 | write_extra_runtime_pkgs(variants, packages, pkgdatadir) |
1504 | 1506 | ||
1505 | if bb.data.inherits_class('allarch', d) and not bb.data.inherits_class('packagegroup', d): | 1507 | if bb.data.inherits_class('allarch', d) and not variants \ |
1508 | and not bb.data.inherits_class('packagegroup', d): | ||
1506 | write_extra_runtime_pkgs(global_variants, packages, pkgdatadir) | 1509 | write_extra_runtime_pkgs(global_variants, packages, pkgdatadir) |
1507 | 1510 | ||
1508 | } | 1511 | } |