mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00
Code Issues Projects Releases Wiki Activity

base.bbclass: Expand PNBLACKLIST across multilibs too

Browse Source 
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 <peter.seebach@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Seebach
2012-08-10 17:32:56 -05:00
committed by Richard Purdie
parent 533b8b913e
commit 13e2effd62
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/base.bbclass
+9 -1
View File
@@ -161,7 +161,8 @@ def pkgarch_mapping(d):
def preferred_ml_updates(d): def preferred_ml_updates(d):
# If any PREFERRED_PROVIDER or PREFERRED_VERSIONS are set, # 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 "" multilibs = d.getVar('MULTILIBS', True) or ""
if not multilibs: if not multilibs:
return return
@@ -174,12 +175,19 @@ def preferred_ml_updates(d):
versions = [] versions = []
providers = [] providers = []
blacklists = d.getVarFlags('PNBLACKLIST') or []
for v in d.keys(): for v in d.keys():
if v.startswith("PREFERRED_VERSION_"): if v.startswith("PREFERRED_VERSION_"):
versions.append(v) versions.append(v)
if v.startswith("PREFERRED_PROVIDER_"): if v.startswith("PREFERRED_PROVIDER_"):
providers.append(v) 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: for v in versions:
val = d.getVar(v, False) val = d.getVar(v, False)
pkg = v.replace("PREFERRED_VERSION_", "") pkg = v.replace("PREFERRED_VERSION_", "")