summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-09-11 23:25:17 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 06:42:28 (GMT)
commitd9ba0219b2f6643ffc825d4b8d3494d07237dd0b (patch)
treea9b272b8d30c962443cddddf8db9469767de7988 /meta/classes/package.bbclass
parentc2d00e2f83cdf3d2923660448756ed29296a06a6 (diff)
downloadpoky-d9ba0219b2f6643ffc825d4b8d3494d07237dd0b.tar.gz
allarch: only enable allarch when multilib is not used
Some allarch packages rdepends non-allarch packages. when multilib is used, it doesn't expand the dependency chain correctly, e.g. core-image-sato -> ca-certificates(allarch) -> openssl we expect dependency chain for lib32-core-image-sato: lib32-core-image-sato -> ca-certificates(allarch) -> lib32-openssl it should install lib32-openssl for ca-certificates but openssl is still wrongly required. Only enable allarch when multilib is not used to fix the issue. (From OE-Core rev: a23c482cab4f874f4a6a6889716123569eb5ece9) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass9
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 0b6f65a..d1e9138 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}