mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 13:49:49 +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:
@@ -274,7 +274,7 @@ python buildhistory_emit_pkghistory() {
|
||||
# Gather information about packaged files
|
||||
val = pkgdata.get('FILES_INFO', '')
|
||||
dictval = json.loads(val)
|
||||
filelist = dictval.keys()
|
||||
filelist = list(dictval.keys())
|
||||
filelist.sort()
|
||||
pkginfo.filelist = " ".join(filelist)
|
||||
|
||||
|
||||
@@ -635,7 +635,7 @@ def check_license_format(d):
|
||||
licenses = d.getVar('LICENSE', True)
|
||||
from oe.license import license_operator, license_operator_chars, license_pattern
|
||||
|
||||
elements = filter(lambda x: x.strip(), license_operator.split(licenses))
|
||||
elements = list(filter(lambda x: x.strip(), license_operator.split(licenses)))
|
||||
for pos, element in enumerate(elements):
|
||||
if license_pattern.match(element):
|
||||
if pos > 0 and license_pattern.match(elements[pos - 1]):
|
||||
|
||||
@@ -1504,7 +1504,7 @@ python package_do_shlibs() {
|
||||
m = re.match("\s+RPATH\s+([^\s]*)", l)
|
||||
if m:
|
||||
rpaths = m.group(1).replace("$ORIGIN", ldir).split(":")
|
||||
rpath = map(os.path.normpath, rpaths)
|
||||
rpath = list(map(os.path.normpath, rpaths))
|
||||
for l in lines:
|
||||
m = re.match("\s+NEEDED\s+([^\s]*)", l)
|
||||
if m:
|
||||
@@ -1674,7 +1674,7 @@ python package_do_shlibs() {
|
||||
bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
|
||||
continue
|
||||
if n[0] in shlib_provider.keys():
|
||||
shlib_provider_path = list()
|
||||
shlib_provider_path = []
|
||||
for k in shlib_provider[n[0]].keys():
|
||||
shlib_provider_path.append(k)
|
||||
match = None
|
||||
|
||||
Reference in New Issue
Block a user