summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 12a30c953c..783b64d9de 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -183,7 +183,7 @@ def preferred_ml_updates(d):
183 providers.append(v) 183 providers.append(v)
184 184
185 for pkg, reason in blacklists.items(): 185 for pkg, reason in blacklists.items():
186 if pkg.endswith("-native") or pkg.startswith("nativesdk-") or 'cross-canadian' in pkg: 186 if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-") or 'cross-canadian' in pkg:
187 continue 187 continue
188 for p in prefixes: 188 for p in prefixes:
189 newpkg = p + "-" + pkg 189 newpkg = p + "-" + pkg
@@ -193,7 +193,7 @@ def preferred_ml_updates(d):
193 for v in versions: 193 for v in versions:
194 val = d.getVar(v, False) 194 val = d.getVar(v, False)
195 pkg = v.replace("PREFERRED_VERSION_", "") 195 pkg = v.replace("PREFERRED_VERSION_", "")
196 if pkg.endswith("-native") or pkg.startswith("nativesdk-"): 196 if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-"):
197 continue 197 continue
198 if 'cross-canadian' in pkg: 198 if 'cross-canadian' in pkg:
199 for p in prefixes: 199 for p in prefixes:
@@ -214,7 +214,7 @@ def preferred_ml_updates(d):
214 for prov in providers: 214 for prov in providers:
215 val = d.getVar(prov, False) 215 val = d.getVar(prov, False)
216 pkg = prov.replace("PREFERRED_PROVIDER_", "") 216 pkg = prov.replace("PREFERRED_PROVIDER_", "")
217 if pkg.endswith("-native") or pkg.startswith("nativesdk-"): 217 if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith("nativesdk-"):
218 continue 218 continue
219 if 'cross-canadian' in pkg: 219 if 'cross-canadian' in pkg:
220 for p in prefixes: 220 for p in prefixes:
@@ -253,7 +253,7 @@ def preferred_ml_updates(d):
253 mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split() 253 mp = (d.getVar("MULTI_PROVIDER_WHITELIST", True) or "").split()
254 extramp = [] 254 extramp = []
255 for p in mp: 255 for p in mp:
256 if p.endswith("-native") or p.startswith("nativesdk-") or 'cross-canadian' in p: 256 if p.endswith(("-native", "-crosssdk")) or p.startswith("nativesdk-") or 'cross-canadian' in p:
257 continue 257 continue
258 virt = "" 258 virt = ""
259 if p.startswith("virtual/"): 259 if p.startswith("virtual/"):