diff options
Diffstat (limited to 'meta/classes/base.bbclass')
| -rw-r--r-- | meta/classes/base.bbclass | 10 |
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): | |||
| 141 | def preferred_ml_updates(d): | 141 | def preferred_ml_updates(d): |
| 142 | # If any PREFERRED_PROVIDER or PREFERRED_VERSION are set, | 142 | # If any PREFERRED_PROVIDER or PREFERRED_VERSION are set, |
| 143 | # we need to mirror these variables in the multilib case; | 143 | # we need to mirror these variables in the multilib case; |
| 144 | # likewise the PNBLACKLIST flags. | ||
| 145 | multilibs = d.getVar('MULTILIBS', True) or "" | 144 | multilibs = d.getVar('MULTILIBS', True) or "" |
| 146 | if not multilibs: | 145 | if not multilibs: |
| 147 | return | 146 | return |
| @@ -154,21 +153,12 @@ def preferred_ml_updates(d): | |||
| 154 | 153 | ||
| 155 | versions = [] | 154 | versions = [] |
| 156 | providers = [] | 155 | providers = [] |
| 157 | blacklists = d.getVarFlags('PNBLACKLIST') or {} | ||
| 158 | for v in d.keys(): | 156 | for v in d.keys(): |
| 159 | if v.startswith("PREFERRED_VERSION_"): | 157 | if v.startswith("PREFERRED_VERSION_"): |
| 160 | versions.append(v) | 158 | versions.append(v) |
| 161 | if v.startswith("PREFERRED_PROVIDER_"): | 159 | if v.startswith("PREFERRED_PROVIDER_"): |
| 162 | providers.append(v) | 160 | providers.append(v) |
| 163 | 161 | ||
| 164 | for pkg, reason in blacklists.items(): | ||
| 165 | if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in pkg: | ||
| 166 | continue | ||
| 167 | for p in prefixes: | ||
| 168 | newpkg = p + "-" + pkg | ||
| 169 | if not d.getVarFlag('PNBLACKLIST', newpkg, True): | ||
| 170 | d.setVarFlag('PNBLACKLIST', newpkg, reason) | ||
| 171 | |||
| 172 | for v in versions: | 162 | for v in versions: |
| 173 | val = d.getVar(v, False) | 163 | val = d.getVar(v, False) |
| 174 | pkg = v.replace("PREFERRED_VERSION_", "") | 164 | pkg = v.replace("PREFERRED_VERSION_", "") |
