mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
classes/lib: Update to explictly create lists where needed
Iterators now return views, not lists in python3. Where we need lists, handle this explicitly. (From OE-Core rev: caebd862bac7eed725e0f0321bf50793671b5312) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -85,11 +85,11 @@ def prune_suffix(var, suffixes, d):
|
||||
|
||||
def str_filter(f, str, d):
|
||||
from re import match
|
||||
return " ".join(filter(lambda x: match(f, x, 0), str.split()))
|
||||
return " ".join([x for x in str.split() if match(f, x, 0)])
|
||||
|
||||
def str_filter_out(f, str, d):
|
||||
from re import match
|
||||
return " ".join(filter(lambda x: not match(f, x, 0), str.split()))
|
||||
return " ".join([x for x in str.split() if not match(f, x, 0)])
|
||||
|
||||
def param_bool(cfg, field, dflt = None):
|
||||
"""Lookup <field> in <cfg> map and convert it to a boolean; take
|
||||
@@ -134,7 +134,7 @@ def packages_filter_out_system(d):
|
||||
PN-dbg PN-doc PN-locale-eb-gb removed.
|
||||
"""
|
||||
pn = d.getVar('PN', True)
|
||||
blacklist = map(lambda suffix: pn + suffix, ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev'))
|
||||
blacklist = [pn + suffix for suffix in ('', '-dbg', '-dev', '-doc', '-locale', '-staticdev')]
|
||||
localepkg = pn + "-locale-"
|
||||
pkgs = []
|
||||
|
||||
|
||||
Reference in New Issue
Block a user