From 13e2effd623aa2c3a864c46e4530cc238c59f0bb Mon Sep 17 00:00:00 2001 From: Peter Seebach Date: Fri, 10 Aug 2012 17:32:56 -0500 Subject: base.bbclass: Expand PNBLACKLIST across multilibs too The PNBLACKLIST feature does not currently work with multilibs, because they have different ${PN}. The obvious thing to do is to do this at the same point that we do the PREFERRED_PROVIDER and PREFERRED_VERSION fixups. (Making the PNBLACKLIST check do the for-each-multilib check requires it to do the multilib list generation repeatedly.) (From OE-Core rev: 9bc0ca9369d0daee94abf60d3d521cc734c7e8cd) Signed-off-by: Peter Seebach Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 192c77761e..840ddbcc93 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -161,7 +161,8 @@ def pkgarch_mapping(d): def preferred_ml_updates(d): # If any PREFERRED_PROVIDER or PREFERRED_VERSIONS are set, - # we need to mirror these variables in the multilib case + # we need to mirror these variables in the multilib case; + # likewise the PNBLACKLIST flags. multilibs = d.getVar('MULTILIBS', True) or "" if not multilibs: return @@ -174,12 +175,19 @@ def preferred_ml_updates(d): versions = [] providers = [] + blacklists = d.getVarFlags('PNBLACKLIST') or [] for v in d.keys(): if v.startswith("PREFERRED_VERSION_"): versions.append(v) if v.startswith("PREFERRED_PROVIDER_"): providers.append(v) + for pkg, reason in blacklists.items(): + for p in prefixes: + newpkg = p + "-" + pkg + if not d.getVarFlag('PNBLACKLIST', newpkg, True): + d.setVarFlag('PNBLACKLIST', newpkg, reason) + for v in versions: val = d.getVar(v, False) pkg = v.replace("PREFERRED_VERSION_", "") -- cgit v1.2.3-54-g00ecf