summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-20 11:53:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:00 +0100
commit44e9a0d2fa759dea281fc32b602cd7878000c277 (patch)
tree69f6944e4bf34e2309ae8b3cc11eac13afcdf675 /meta/classes
parent8587bce564f715e46e7317218b5c190813d3a939 (diff)
downloadpoky-44e9a0d2fa759dea281fc32b602cd7878000c277.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/buildhistory.bbclass2
-rw-r--r--meta/classes/license.bbclass2
-rw-r--r--meta/classes/package.bbclass4
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index cc233b5130..1ccd9ee485 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -274,7 +274,7 @@ python buildhistory_emit_pkghistory() {
274 # Gather information about packaged files 274 # Gather information about packaged files
275 val = pkgdata.get('FILES_INFO', '') 275 val = pkgdata.get('FILES_INFO', '')
276 dictval = json.loads(val) 276 dictval = json.loads(val)
277 filelist = dictval.keys() 277 filelist = list(dictval.keys())
278 filelist.sort() 278 filelist.sort()
279 pkginfo.filelist = " ".join(filelist) 279 pkginfo.filelist = " ".join(filelist)
280 280
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 538ab1976e..10d6ed853a 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -635,7 +635,7 @@ def check_license_format(d):
635 licenses = d.getVar('LICENSE', True) 635 licenses = d.getVar('LICENSE', True)
636 from oe.license import license_operator, license_operator_chars, license_pattern 636 from oe.license import license_operator, license_operator_chars, license_pattern
637 637
638 elements = filter(lambda x: x.strip(), license_operator.split(licenses)) 638 elements = list(filter(lambda x: x.strip(), license_operator.split(licenses)))
639 for pos, element in enumerate(elements): 639 for pos, element in enumerate(elements):
640 if license_pattern.match(element): 640 if license_pattern.match(element):
641 if pos > 0 and license_pattern.match(elements[pos - 1]): 641 if pos > 0 and license_pattern.match(elements[pos - 1]):
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 501004ed48..c9e2aa81ca 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1504,7 +1504,7 @@ python package_do_shlibs() {
1504 m = re.match("\s+RPATH\s+([^\s]*)", l) 1504 m = re.match("\s+RPATH\s+([^\s]*)", l)
1505 if m: 1505 if m:
1506 rpaths = m.group(1).replace("$ORIGIN", ldir).split(":") 1506 rpaths = m.group(1).replace("$ORIGIN", ldir).split(":")
1507 rpath = map(os.path.normpath, rpaths) 1507 rpath = list(map(os.path.normpath, rpaths))
1508 for l in lines: 1508 for l in lines:
1509 m = re.match("\s+NEEDED\s+([^\s]*)", l) 1509 m = re.match("\s+NEEDED\s+([^\s]*)", l)
1510 if m: 1510 if m:
@@ -1674,7 +1674,7 @@ python package_do_shlibs() {
1674 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0])) 1674 bb.debug(2, '%s: Dependency %s covered by PRIVATE_LIBS' % (pkg, n[0]))
1675 continue 1675 continue
1676 if n[0] in shlib_provider.keys(): 1676 if n[0] in shlib_provider.keys():
1677 shlib_provider_path = list() 1677 shlib_provider_path = []
1678 for k in shlib_provider[n[0]].keys(): 1678 for k in shlib_provider[n[0]].keys():
1679 shlib_provider_path.append(k) 1679 shlib_provider_path.append(k)
1680 match = None 1680 match = None