summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-20 11:49:34 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-02 08:24:00 +0100
commit8587bce564f715e46e7317218b5c190813d3a939 (patch)
treed67f45ca7d88f1ea1dcfc436a82763fa6c39a686 /meta/classes
parenta7309d5790f5dac46e84d3c14959943eb2496fda (diff)
downloadpoky-8587bce564f715e46e7317218b5c190813d3a939.tar.gz
classes/lib: Update to match python3 iter requirements
python3 standardises its use of iteration operations. Update the code to match the for python3 requires. (From OE-Core rev: 2476bdcbef591e951d11d57d53f1315848758571) 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.bbclass4
-rw-r--r--meta/classes/populate_sdk_ext.bbclass4
3 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index e3b5c44a09..cc233b5130 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -838,7 +838,7 @@ python write_srcrev() {
838 f.write('# SRCREV_%s = "%s"\n' % (name, orig_srcrev)) 838 f.write('# SRCREV_%s = "%s"\n' % (name, orig_srcrev))
839 f.write('SRCREV_%s = "%s"\n' % (name, srcrev)) 839 f.write('SRCREV_%s = "%s"\n' % (name, srcrev))
840 else: 840 else:
841 f.write('SRCREV = "%s"\n' % srcrevs.itervalues().next()) 841 f.write('SRCREV = "%s"\n' % srcrevs.values())
842 if len(tag_srcrevs) > 0: 842 if len(tag_srcrevs) > 0:
843 for name, srcrev in tag_srcrevs.items(): 843 for name, srcrev in tag_srcrevs.items():
844 f.write('# tag_%s = "%s"\n' % (name, srcrev)) 844 f.write('# tag_%s = "%s"\n' % (name, srcrev))
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 69335d650d..538ab1976e 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -200,7 +200,7 @@ def get_deployed_dependencies(d):
200 # it might contain the bootloader. 200 # it might contain the bootloader.
201 taskdata = d.getVar("BB_TASKDEPDATA", False) 201 taskdata = d.getVar("BB_TASKDEPDATA", False)
202 depends = list(set([dep[0] for dep 202 depends = list(set([dep[0] for dep
203 in taskdata.itervalues() 203 in list(taskdata.values())
204 if not dep[0].endswith("-native")])) 204 if not dep[0].endswith("-native")]))
205 extra_depends = d.getVar("EXTRA_IMAGEDEPENDS", True) 205 extra_depends = d.getVar("EXTRA_IMAGEDEPENDS", True)
206 boot_depends = get_boot_dependencies(d) 206 boot_depends = get_boot_dependencies(d)
@@ -261,7 +261,7 @@ def get_boot_dependencies(d):
261 depends.append(dep) 261 depends.append(dep)
262 # We need to search for the provider of the dependency 262 # We need to search for the provider of the dependency
263 else: 263 else:
264 for taskdep in taskdepdata.itervalues(): 264 for taskdep in taskdepdata.values():
265 # The fifth field contains what the task provides 265 # The fifth field contains what the task provides
266 if dep in taskdep[4]: 266 if dep in taskdep[4]:
267 info_file = os.path.join( 267 info_file = os.path.join(
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 4c3a038609..a9c6fe5933 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -45,7 +45,7 @@ def get_sdk_install_targets(d):
45 sdk_install_targets = d.getVar('SDK_TARGETS', True) 45 sdk_install_targets = d.getVar('SDK_TARGETS', True)
46 46
47 depd = d.getVar('BB_TASKDEPDATA', False) 47 depd = d.getVar('BB_TASKDEPDATA', False)
48 for v in depd.itervalues(): 48 for v in depd.values():
49 if v[1] == 'do_image_complete': 49 if v[1] == 'do_image_complete':
50 if v[0] not in sdk_install_targets: 50 if v[0] not in sdk_install_targets:
51 sdk_install_targets += ' {}'.format(v[0]) 51 sdk_install_targets += ' {}'.format(v[0])
@@ -267,7 +267,7 @@ python copy_buildsystem () {
267 # Ensure any variables set from the external environment (by way of 267 # Ensure any variables set from the external environment (by way of
268 # BB_ENV_EXTRAWHITE) are set in the SDK's configuration 268 # BB_ENV_EXTRAWHITE) are set in the SDK's configuration
269 extralines = [] 269 extralines = []
270 for name, value in env_whitelist_values.iteritems(): 270 for name, value in env_whitelist_values.items():
271 actualvalue = d.getVar(name, True) or '' 271 actualvalue = d.getVar(name, True) or ''
272 if value != actualvalue: 272 if value != actualvalue:
273 extralines.append('%s = "%s"\n' % (name, actualvalue)) 273 extralines.append('%s = "%s"\n' % (name, actualvalue))