aboutsummaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-08-10 17:19:30 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-08-13 23:06:03 +0100
commit9bb0b1c28578128a861dccf053ed611cd1c4b8bb (patch)
tree29a6628697071a7724ebd2bdef049ff3afb194b4 /meta/classes/base.bbclass
parent3aabe00df69f1a2aa7eff97e042ed0ce15613f0f (diff)
downloadopenembedded-core-contrib-9bb0b1c28578128a861dccf053ed611cd1c4b8bb.tar.gz
blacklist.bbclass: Avoid blacklist specific handle in base.bbclass
base.bbclass had code which handled the PNBLACKLIST in case of multilib use. This is better to be done in the blacklist.bbclass so it has all logic in a single place. (From OE-Core rev: 04f0fefeccc1e7e3af8a1f741350492ae3f171fc) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass10
1 files changed, 0 insertions, 10 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 99748796e6..98b823e7eb 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -141,7 +141,6 @@ def pkgarch_mapping(d):
def preferred_ml_updates(d):
# If any PREFERRED_PROVIDER or PREFERRED_VERSION are set,
# we need to mirror these variables in the multilib case;
- # likewise the PNBLACKLIST flags.
multilibs = d.getVar('MULTILIBS', True) or ""
if not multilibs:
return
@@ -154,21 +153,12 @@ 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():
- if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in pkg:
- continue
- 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_", "")